use i2p.plugins.firefox as a plugin instead of as a library

.gitattributes

@@ -0,0 +1 @@
+* -text

.github/workflows/ant.yml

@@ -0,0 +1,117 @@
+
+name: Java CI
+
+on: [push]
+
+jobs:
+
+  nsis:
+    runs-on: windows-latest
+    steps:
+      - uses: Vampire/setup-wsl@v3
+        with:
+          distribution: Ubuntu-20.04
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global user.email "github@i2p.net"
+          git config --global user.name "eyedeekay Github CI Build"
+      - uses: actions/checkout@v4
+      - run: wsl apt-get update
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Easy-Install-Bundle-unsigned.exe
+          path: I2P-Easy-Install-Bundle-2.4.0.exe
+
+  buildjpackagexe:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/exe.sh; ls *.exe"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-EXE-unsigned.exe
+          path: I2P-EXE-2.4.0.exe
+
+  buildjpackagmsi:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/msi.sh; ls *.msi"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.msi
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-MSI-unsigned.msi
+          path: I2P-MSI-2.4.0.msi
+
+  buildzip:
+    runs-on: windows-latest
+    steps:
+      - uses: Vampire/setup-wsl@v3
+        with:
+          distribution: Ubuntu-20.04
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global user.email "github@i2p.net"
+          git config --global user.name "eyedeekay Github CI Build"
+      - uses: actions/checkout@v4
+      - run: wsl apt-get update
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip
+      - run: choco install wget
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/zip.sh; ls *.zip"
+      - name: Upload I2P-windows-portable.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-windows-portable.zip
+          path: I2P-windows-portable.zip
+        
+  buildtgz:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
+      - name: build with script
+        run: ./buildscripts/targz.sh; ls *.tar.gz
+      - name: Upload I2P.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P.tar.gz
+          path: I2P.tar.gz

.github/workflows/release.yml

@@ -0,0 +1,79 @@
+name: Release
+
+#on: [push]
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'i2p-firefox-*.*.*' # Release i2p-firefox-1.2.3
+      - 'i2p-firefox-*.*.*-*' # Release i2p-firefox-1.2.3
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            changelog.txt
+          sparse-checkout-cone-mode: false
+      - name: sleep 15 minutes
+        run: |
+          echo "sleeping 15 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 14 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 13 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 12 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 11 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 10 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 9 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 8 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 7 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 6 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 5 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 4 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 3 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 2 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 1 minutes to wait for artifacts"
+          sleep 1m
+      - name: Download artifacts
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          skip_unpack: true
+          workflow: ant.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: echo "" | tee -a changelog.txt
+      - run: echo "## Checksums" | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: sha256sum * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: file * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          bodyFile: "changelog.txt"

buildscripts/exe.sh

@@ -7,7 +7,7 @@ cd "$SCRIPT_DIR" || exit 1
 
 . ./config.sh
 . ./i2pversion
-./build.sh
+./buildscripts/build.sh
 jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \

buildscripts/launcher.sh

@@ -104,9 +104,15 @@ if [ ! -f "$SCRIPT_DIR/build/jna-platform.jar" ]; then
   wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
 fi
 
-if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.jar" ]; then
+if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.zip" ]; then
   echo "downloading i2pfirefox jars"
-  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
+  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/plugin.zip" -O "$SCRIPT_DIR/build/i2pfirefox.zip"
+fi
+
+if [ ! -d "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox" ]; then
+  mkdir -p "$SCRIPT_DIR/build/I2P/config/plugins/"
+  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/build/I2P/config/plugins/plugin"
+  mv "$SCRIPT_DIR/build/I2P/config/plugins/plugin" "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
 fi
 
 for dll in "$I2P_JBIGI/"*windows*.dll; do

buildscripts/unsigned.sh

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
-cd "$SCRIPT_DIR" || exit 1
+cd "$SCRIPT_DIR" || cd ../ ; SCRIPT_DIR=$(pwd)
 
 . "$SCRIPT_DIR/config.sh"
 

buildscripts/zip.sh

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
-cd "$SCRIPT_DIR" || exit 1
+cd "$SCRIPT_DIR" || cd ../ ; SCRIPT_DIR=$(pwd)
 
 . "$SCRIPT_DIR/config.sh"
 
@@ -16,7 +16,7 @@ TORSOCKS=$(which torsocks)
 if [ -f "${TORSOCKS}" ]; then
     . "${TORSOCKS}" on
 fi
-"$SCRIPT_DIR"/src/win/torbrowser-windows.sh
+#"$SCRIPT_DIR"/src/win/torbrowser-windows.sh
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 . "${TORSOCKS}" off
 locale="en-US" # mention your locale. default = en-US
@@ -28,5 +28,6 @@ rm -vrf "tor-browser_${locale}"
 cd "$SCRIPT_DIR" || exit 1
 
 rm -rf I2P-portable && cp -r I2P I2P-portable
-#powershell Compress-Archive -force I2P-portable I2P-windows-portable.zip
-zip -r I2P-windows-portable.zip I2P-portable
+
+which zip && zip -r I2P-windows-portable.zip I2P-portable
+which zip || powershell Compress-Archive -force I2P-portable I2P-windows-portable.zip

i2pversion

@@ -2,8 +2,8 @@
 
 JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
-I2PFIREFOX_VERSION=1.0.9
-export I2PFIREFOX_VERSION=1.0.9
+I2PFIREFOX_VERSION=1.4.7
+export I2PFIREFOX_VERSION=1.4.7
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=2

java/net/i2p/router/WinLauncher.java

@@ -10,7 +10,7 @@ import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 import net.i2p.app.ClientAppManager;
 import net.i2p.crypto.*;
-import net.i2p.i2pfirefox.*;
+//import net.i2p.i2pfirefox.*;
 import net.i2p.router.Router;
 import net.i2p.router.RouterLaunch;
 import net.i2p.update.*;
@@ -36,9 +36,6 @@ public class WinLauncher extends CopyConfigDir {
     var launcher = new WinLauncher();
     launcher.setupLauncher();
     launcher.initLogger();
-    int privateBrowsing = 0;
-    boolean usabilityMode = false;
-    boolean chromiumFirst = false;
     int proxyTimeoutTime = 200;
     ArrayList<String> newArgsList = new ArrayList<String>();
 
@@ -46,14 +43,11 @@ public class WinLauncher extends CopyConfigDir {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
-            privateBrowsing = 1;
             launcher.logger.info(
                 "Private browsing is true, profile will be discarded at end of session.");
           } else if (arg.equals("-chromium")) {
-            chromiumFirst = true;
             launcher.logger.info("Chromium will be selected before Firefox.");
           } else if (arg.equals("-usability")) {
-            usabilityMode = true;
             launcher.logger.info(
                 "Usability mode is true, using alternate extensions loadout.");
           } else if (arg.equals("-noproxycheck")) {
@@ -124,10 +118,6 @@ public class WinLauncher extends CopyConfigDir {
       System.exit(1);
     }
 
-    if (launcher.launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
-                               proxyTimeoutTime, newArgsList)) {
-      System.exit(0);
-    }
     launcher.i2pRouter =
         new Router(launcher.routerConfig(), System.getProperties());
     if (!launcher.isInstalled("i2p")) {
@@ -186,29 +176,6 @@ public class WinLauncher extends CopyConfigDir {
     return home;
   }
 
-  private boolean launchBrowser(int 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
   private boolean isAvailable(int portNr) {

src/unix/torbrowser.sh

@@ -18,10 +18,11 @@ if [ ! -f ./tor.keyring ]; then
 fi
 
 if [ ! -f "tor-browser-linux64-${version}_${locale}.tar.xz" ]; then
-    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${locale}.tar.xz" 
-    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${locale}.tar.xz.asc"
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+    https://dist.torproject.org/torbrowser/13.0.9/
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz.asc"
 fi
 
-gpgv --keyring ./tor.keyring "tor-browser-linux64-${version}_${locale}.tar.xz.asc" "tor-browser-linux64-${version}_${locale}.tar.xz"
+gpgv --keyring ./tor.keyring "tor-browser-linux-x86_64-${version}.tar.xz.asc" "tor-browser-linux-x86_64-${version}.tar.xz"
 
-tar xvJf "tor-browser-linux64-${version}_${locale}.tar.xz"
+tar xvJf "tor-browser-linux-x86_64-${version}.tar.xz"