Extensions run requests in what is effectively their own container for our purposes, and one that's not exactly easy to determine is in use. But when we don't recognize the context and cannot jump out of context into an I2P tab, we basically it's coming from inside an extension(Or firefox-private, but that's sort of a whole other can of worms I need to tackle soon). TL:DR if it has no context, then we'll need to decide in favor of proxying requests to .i2p urls via I2P HTTP Proxy for it. The effect is that we can set the RPC remote for say, a bittorrent client, to the .b32.i2p URL of our BiglyBT xmwebwebui remote, for instance.

Spanish

Makefile

@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.92
-VERSION=0.91
+MOZ_VERSION=0.96
+VERSION=0.95
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.89
+LAST_VERSION=0.93
 
 YELLOW=F7E59A
 ORANGE=FFC56D

_locales/es/messages.json

@@ -0,0 +1,302 @@
+{
+  "extensionName": {
+    "message": "I2P en navegación privada",
+    "description": "Nombre de la extensión."
+  },
+  "toopieName": {
+    "message": "toopie.html",
+    "description": "Nombre de la barra lateral."
+  },
+  "toopieTLS": {
+    "message": "Propiedades del sitio",
+    "description": "Nombre del panel de seguridad."
+  },
+  "extensionDescription": {
+    "message": "Su navegador ahora está configurado para usar I2P.",
+    "description": "Descripción de la extensión."
+  },
+  "extensionVersion": {
+    "message": "0,77",
+    "description": "Versión de la extensión."
+  },
+  "proxyFailedStatus": {
+    "message": "El proxy no está listo",
+    "description": "Estado fallido del proxy."
+  },
+  "proxySuccessStatus": {
+    "message": "El proxy está listo",
+    "description": "Estado fallido del proxy."
+  },
+  "controlHeader": {
+    "message": "Control",
+    "description": "Título del panel de control."
+  },
+  "controlExplain": {
+    "message": "Estos controles se utilizan para personalizar su experiencia de navegación I2P",
+    "description": "Introduce el panel de control."
+  },
+  "clearData": {
+    "message": "Borrar datos de navegación:",
+    "description": "Elemento de menú Borrar datos de navegación."
+  },
+  "clearDesc": {
+    "message": "Use esto para borrar sus datos de navegación I2P.",
+    "description": "Borrar descripción de la acción de datos de navegación."
+  },
+  "enableWebRTC": {
+    "message": "¿Habilitar WebRTC con proxy?",
+    "description": "Etiqueta de casilla de verificación de WebRTC."
+  },
+  "rtcDesc": {
+    "message": "WebRTC está deshabilitado de forma predeterminada, pero puede volver a encenderlo y forzarlo para que respete el proxy. Si es un usuario de la extensión del navegador Snowflake, esta opción está deshabilitada y WebRTC está activado de forma predeterminada.",
+    "description": "Descripción de la acción de WebRTC"
+  },
+  "disableHistory": {
+    "message": "¿Deshabilitar el historial en las pestañas I2P?",
+    "description": "Etiqueta de casilla de verificación del historial."
+  },
+  "histDesc": {
+    "message": "El historial se borra automáticamente cuando se cierran las pestañas de I2P. Si desea borrar el historial sobre la marcha, marque esta casilla.",
+    "description": "Descripción de la acción del historial"
+  },
+  "applicationHeader": {
+    "message": "Aplicaciones",
+    "description": "Encabezado de la sección de aplicaciones."
+  },
+  "applicationExplain": {
+    "message": "Estas aplicaciones funcionan con I2P directamente para brindarles seguridad y privacidad.",
+    "description": "Descripción de la sección de aplicación."
+  },
+  "windowVisitConsole": {
+    "message": "Consola del enrutador:",
+    "description": "Etiqueta de la consola del enrutador."
+  },
+  "routerConsole": {
+    "message": "El punto de entrada para todas las demás aplicaciones I2P es la consola del enrutador I2P. Para visitarla, haga clic aquí.",
+    "description": "Descripción de la consola del enrutador."
+  },
+  "windowVisitHomepage": {
+    "message": "Página de inicio:",
+    "description": "Página de inicio para la etiqueta de extensión."
+  },
+  "abouthome": {
+    "message": "Para obtener más información sobre esta extensión, visite esta página.",
+    "description": "Descripción de la página del botón de extensión."
+  },
+  "windowVisitHelppage": {
+    "message": "Página de ayuda:",
+    "description": "Página de ayuda para la etiqueta de extensión."
+  },
+  "help": {
+    "message": "Para obtener más información sobre esta extensión, visite esta página.",
+    "description": "Descripción de la página del botón de extensión."
+  },
+  "windowVisitI2ptunnel": {
+    "message": "Administrador de servicios ocultos:",
+    "description": "Título para i2ptunnel"
+  },
+  "i2ptunnel": {
+    "message": "I2P tiene una interfaz basada en web para configurar servicios .i2p como sitios web que puede configurar.",
+    "description": "Descripción de i2ptunnel"
+  },
+  "windowVisitSusimail": {
+    "message": "Correo electrónico:",
+    "descripción": "Título del correo electrónico"
+  },
+  "susimail": {
+    "message": "I2P también incluye un cliente de correo web que se puede utilizar para acceder al correo electrónico in-I2P.",
+    "description": "Descripción para correo electrónico"
+  },
+  "windowVisitSnark": {
+    "message": "Bittorrent:",
+    "description": "Título para Bittorrent"
+  },
+  "snark": {
+    "message": "I2P es capaz de compartir archivos de igual a igual de forma anónima utilizando la aplicación bittorrent incorporada.",
+    "description": "Descripción de Bittorrent"
+  },
+  "windowVisitSources": {
+    "message": "Código fuente de extensión:",
+    "description": "Título del enlace del código fuente"
+  },
+  "sources": {
+    "message": "Examine el código fuente aquí",
+    "description": "Descripción del enlace del código fuente"
+  },
+  "windowVisitWebPage": {
+    "message": "Página de inicio de la extensión:",
+    "description": "Visita la página de inicio de la extensión en Github"
+  },
+  "homepage": {
+    "message": "Hay más información disponible aquí",
+    "description": "Encontrar más información"
+  },
+  "windowVisitReleases": {
+    "message": "Extension Releases:",
+    "description": "Visite la página de lanzamiento"
+  },
+  "releases": {
+    "message": "Compruebe si hay nuevas versiones aquí",
+    "description": "Descripción de la nueva página de lanzamiento"
+  },
+  "titlePreface": {
+    "message": "Navegador I2P",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "titlePrefacePrivate": {
+    "message": "Navegador I2P (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "extensionPreface": {
+    "message": "Gestión I2P",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "webPreface": {
+    "message": "Navegador web",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "webPrefacePrivate": {
+    "message": "Navegador web (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "ircPreface": {
+    "message": "Envío de IRC",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "ircPrefacePrivate": {
+    "message": "Despacho de IRC (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "botePreface": {
+    "message": "I2P-Bote Mail",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "botePrefacePrivate": {
+    "message": "I2P-Bote Mail (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "routerPreface": {
+    "message": "Consola del enrutador",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "routerPrefacePrivate": {
+    "message": "Consola del enrutador (privada)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "torrentPreface": {
+    "message": "Bittorrent",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "torrentPrefacePrivate": {
+    "message": "Bittorrent (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "mailPreface": {
+    "message": "Correo web",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "mailPrefacePrivate": {
+    "message": "Correo web (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "i2ptunnelPreface": {
+    "message": "Administrador de servicios ocultos",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "i2ptunnelPrefacePrivate": {
+    "message": "Administrador de servicios ocultos (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "muwirePreface": {
+    "message": "MuWire",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "muwirePrefacePrivate": {
+    "message": "MuWire (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "resetMessage": {
+    "message": "Reset Tunnel",
+    "description": "Mensaje para el botón Reset Tunnel"
+  },
+  "infoTitle": {
+    "message": "Ayuda I2P",
+    "description": "Título del menú de ayuda"
+  },
+  "infoMessage": {
+    "message": "¡Ahora puede navegar libremente por eepWeb! Su navegador ahora está configurado para navegar de forma anónima en la red I2P. Mientras navega, su tráfico se enrutará a través de otros nodos de red para disfrazar su origen, tanto desde el servidor de los propios nodos. ",
+    "description": "Mensaje de ayuda"
+  },
+  "helpMessage": {
+    "message": "Obtén ayuda adicional",
+    "description": "Mensaje de ayuda"
+  },
+  "newsMessage": {
+    "message": "Visite el blog de I2P para conocer las últimas novedades sobre i2p.",
+    "description": "Mensaje de ayuda"
+  },
+  "forumMessage": {
+    "message": "Visite el Foro I2P para obtener más información o solicitar ayuda",
+    "description": "Mensaje de ayuda"
+  },
+  "proxyHelpText": {
+    "message": "Configure aquí su proxy I2P",
+    "description": "Ayuda para configurar las opciones del botón Reset Tunnel"
+  },
+  "hostText": {
+    "message": "Anfitrión:",
+    "description": "Host para el proxy HTTP o SOCKS5"
+  },
+  "portText": {
+    "message": "Puerto:",
+    "description": "Puerto para el proxy HTTP o SOCKS5"
+  },
+  "controlHelpText": {
+    "message": "Configure aquí la consola de su enrutador.",
+    "description": "Ayuda para configurar las opciones del botón Reset Tunnel"
+  },
+  "controlHostText": {
+    "message": "Host de control:",
+    "description": "Host para la consola del enrutador"
+  },
+  "controlPortText": {
+    "message": "Puerto de control:",
+    "description": "Puerto para la consola del enrutador"
+  },
+  "controlHostValue": {
+    "message": "127.0.0.1",
+    "description": "Host para la consola del enrutador"
+  },
+  "controlPortValue": {
+    "message": "7657",
+    "description": "Puerto para la consola del enrutador"
+  },
+  "isBase32": {
+    "message": "Dirección con formato I2P Base32",
+    "description": "Mensaje para el panel de información del sitio base32"
+  },
+  "isHostName": {
+    "message": "Nombre de host de salto I2P",
+    "description": "Mensaje para el nombre de host del panel de información del sitio"
+  },
+  "siteLabel": {
+    "message": "Dirección / Información del sitio:",
+    "description": "Etiqueta para la información del sitio i2p"
+  },
+  "certLabel": {
+    "message": "Información del certificado:",
+    "description": "Etiqueta para la información del certificado"
+  },
+  "certAbsent": {
+    "message": "Este sitio no está usando HTTPS. I2P aún lo verifica criptográficamente.",
+    "description": "Contenido de la información del certificado si no está"
+  },
+  "certPresent": {
+    "message": "Este sitio utiliza HTTPS. HTTPS sobre I2P es experimental y requiere certificados autofirmados o autorizaciones raíz alternativas.",
+    "description": "Contenido de la información del certificado si está presente"
+  },
+  "protocolHandlerValue": {
+    "message": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent",
+    "description": "Valor para el controlador de protocolo magnético"
+  }
+}

debian/changelog

@@ -1,3 +1,15 @@
+i2psetproxy.js (0.95-1) UNRELEASED; urgency=low
+
+  * Fix github #102 and #103
+
+ -- idk <hankhill19580@gmail.com>  Sat, 21 DEC 2020 6:15:05 -0400
+
+i2psetproxy.js (0.93-1) UNRELEASED; urgency=low
+
+  * Emergency fix of the first one
+
+ -- idk <hankhill19580@gmail.com>  Sat, 14 DEC 2020 5:18:53 -0400
+
 i2psetproxy.js (0.91-1) UNRELEASED; urgency=low
 
   * Exclude clearnet code hosting sites from scrub checks

host.js

@@ -47,7 +47,10 @@ function extensionHost(url) {
 function i2pHostName(url) {
   let hostname = '';
   console.log('(hosts)', url);
-  if (url.includes('=')) {
+  let u = new URL(url);
+  if (u.host.endsWith('.i2p')) {
+    hostname = u.host;
+  } else if (url.includes('=')) {
     if (url.includes('.i2p')) {
       lsit = url.split('=');
       for (let item in lsit) {
@@ -68,6 +71,7 @@ function i2pHostName(url) {
   } else {
     hostname = url.split('/')[0];
   }
+  console.log('(hosts) scrub', hostname);
   return hostname;
 }
 
@@ -112,6 +116,8 @@ function routerHost(url) {
         final === 'home' ||
         final === 'console' ||
         final === 'dns' ||
+        final === 'susidns' ||
+        final.startsWith('susidns') ||
         final === 'sitemap' ||
         final.startsWith('config')
       ) {

index.html

@@ -1,222 +1,233 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>I2P in Private Browsing Mode</title>
-    <link href="home.css" rel="stylesheet" type="text/css">
-    <link href="sidebar.css" rel="stylesheet" type="text/css">
+  <title>I2P in Private Browsing Mode</title>
+  <link rel="stylesheet" type="text/css" href="home.css" />
+  <link rel="stylesheet" type="text/css" href="sidebar.css" />
 </head>
 <body>
-    <h1>I2P in Private Browsing Mode(Firefox-Only)</h1>
+<h1>I2P in Private Browsing Mode(Firefox-Only)</h1>
 
-    <p>This is an webextension which introduces a set of new "Private Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes it easier to configure a browser to use I2P securely and adds features for making I2P applications easier to use. It does this by isolating I2P-specific settings to Contextual Identities within Firefox, then loading them automatically when the user requests them. It also adds convenience and management features, like an embedded I2P console and Bittorrent integration with clients using the transmission-rpc API.</p>
+<p>This is an webextension which introduces a set of new "Private Browsing" modes
+to Firefox-based browsers(Supporting webextensions) that makes it easier to
+configure a browser to use I2P securely and adds features for making I2P
+applications easier to use. It does this by isolating I2P-specific settings to
+Contextual Identities within Firefox, then loading them automatically when the
+user requests them. It also adds convenience and management features, like an
+embedded I2P console and Bittorrent integration with clients using the
+transmission-rpc API.</p>
 
-    <h2>Privacy Policy</h2>
+<h2>Privacy Policy</h2>
 
-    <p>This browser extension does not collect any personal information. It requires access to local storage and browsing data permissions in order to delete them when directed to by the user. This browser extension does not transmit any information to any third party, nor will it, ever.</p>
+<p>This browser extension does not collect any personal information. It requires
+access to local storage and browsing data permissions in order to delete them
+when directed to by the user. This browser extension does not transmit any
+information to any third party, nor will it, ever.</p>
 
-    <p>This browser extension cannot influence telemetry carried out by browser vendors to determine performance in their distribution channels, nor can it mitigate any other browser vendor telemetry.</p>
+<p>This browser extension cannot influence telemetry carried out by browser vendors
+to determine performance in their distribution channels, nor can it mitigate any
+other browser vendor telemetry. </p>
 
-    <p>This browser extension is entirely Free, Open-Source software.</p>
+<p>This browser extension is entirely Free, Open-Source software.</p>
 
-    <h2>Installation(Cross-Platform):</h2>
+<h2>Installation(Cross-Platform):</h2>
 
-    <p>For desktop users this addon is available from addons.mozilla.org, where you will be able to recive automatic updates: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>.</p>
+<p>For desktop users this addon is available from addons.mozilla.org, where you
+will be able to recive automatic updates:
+<a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>.</p>
 
-    <h2>Debian Installation:</h2>
+<h2>Debian Installation:</h2>
 
-    <p>Should you prefer, it is possible to install this extension system-wide by side-loading it into Debian. You can generate your own deb file by running the command:</p>
+<p>Should you prefer, it is possible to install this extension system-wide by
+side-loading it into Debian. You can generate your own deb file by running the
+command:</p>
 
-    <pre><code>    make deb
+<pre><code>    make deb
 </code></pre>
-    <p>and then you can install it with:</p>
 
-    <pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+<p>and then you can install it with:</p>
+
+<pre><code>    sudo apt install ../i2psetproxy.js_*.deb
 </code></pre>
-    <h2>Bittorrent Download:</h2>
 
-    <p>The self-hosted plugin is available from bittorrent both within the I2P and Clearnet Bittorrent network(With a web seed to support it in case one goes dead).</p>
+<h2>Bittorrent Download:</h2>
 
-    <ul>
-        <li>
-            <a href="magnet:?xt=urn:btih:7c941672fd7b36cbb2cec817549616ef51d70bfd">Magnet Link</a>
-        </li>
+<p>The self-hosted plugin is available from bittorrent both within the I2P and
+Clearnet Bittorrent network(With a web seed to support it in case one goes
+dead).</p>
 
-        <li>
-            <a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a>
-        </li>
-    </ul>
+<ul>
+<li><a href="magnet:?xt=urn:btih:7ec361c3ddc3fb904e369a19cdf4259af94af624">Magnet Link</a></li>
+<li><a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a></li>
+</ul>
 
-    <h2>Usage:</h2>
+<h2>Usage:</h2>
 
-    <ul>
-        <li>Basically, it "Just Works." After you install the plugin, browsing to an I2P domain will automatically stop the current tab and re-open the I2P site in an I2P Browser tab.</li>
+<ul>
+<li>Basically, it "Just Works." After you install the plugin, browsing to an I2P
+domain will automatically stop the current tab and re-open the I2P site in an
+I2P Browser tab.</li>
+<li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which
+will take you to visit your Java I2P applications, or the "Simplified I2P
+Landing Page" embedded in the plugin:</li>
+<li><img src="lander.png" alt="Landing page" title="" /></li>
+<li>Also, there's a menu for accessing I2P functionality while you're browsing.
+It lets you control a few settings in a granular way.</li>
+<li><img src="menu.png" alt="Menu" title="" /></li>
+<li>You can re-enable WebRTC but force it to always use the proxy that is
+enforced by the tab.</li>
+<li>You can either force the browser to delete all history for I2P sites
+immediately, or you can close all your I2P Browser tabs at once and delete
+the history for I2P browsing when you're done.</li>
+<li>That's all there is to it! Your browser is configured to safely use and
+administer I2P.</li>
+<li>Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the
+transmission-rpc interface. To do this, have a look at the torrent guide:
+<a href="torrent/index.html">Torrent guide</a></li>
+</ul>
 
-        <li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which will take you to visit your Java I2P applications, or the "Simplified I2P Landing Page" embedded in the plugin:</li>
+<h3>Features</h3>
 
-        <li><img alt="Landing page" src="lander.png" title="">
-        </li>
+<ul>
+<li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity
+(container). Intercept requests to .i2p domains and automatically route them
+to the I2P container. Isolate the router console from other local
+applications by automatically intercepting requests to the router console to
+another container.</li>
+<li><img src="i2psetproxy.js.png" alt="Visiting i2p-projekt.i2p" title="" /></li>
+<li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an
+acceptable way to indicate it on Android.</li>
+<li><img src="susimail.png" alt="Visiting webmail" title="" /></li>
+<li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically.
+Provide specific configuration for other types of I2P proxies(SOCKS,
+isolating HTTP)</li>
+<li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable
+them with the proxy enforced.</li>
+<li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in
+use</li>
+<li><img src="i2ptunnel.png" alt="Visiting i2ptunnel" title="" /></li>
+<li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+<li>[done] <strong>Monitor</strong> the health and readiness of the I2P router it is
+instructed to use. Currently the plugin checks whether the HTTP Proxy is
+working by fetching an image from "http://proxy.i2p" and displaying a result.
+A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
+inert at this time.</li>
+<li><img src="toopie.png" alt="Visiting toopie.html" title="" /></li>
+<li>[Done] <strong>Handle</strong> router console applications under their own origins and
+within their own contextual identity. (1) The router console is automatically
+confined to it's own container tab. (2) Use a custom protocol handler to
+place each i2p application/plugin under it's own origin, shortening router
+console URL's and placing applications under their own origin.</li>
+<li><img src="routerconsole.png" alt="Visiting routerconsole" title="" /></li>
+<li>[Done] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then
+adding them directly into the Firefox downloads drop-downs, menus, etc. Enable
+the use of I2PSnark as a peer-to-peer delivery mechanism for media files.</li>
+<li><img src="i2psnark.png" alt="Visiting i2psnark" title="" /></li>
+<li><img src="transmissionrpc.png" alt="Monitoring torrents" title="" /></li>
+<li><img src="x-i2p-torrentlocation.png" alt="Distribute your site as a torrent." title="" /></li>
+<li>[Started] <strong>Indicate</strong> the level of authenticity provided by TLS. TLS is
+optional on I2P for now, but some sites offer it anyway. TLS support is
+experimental and in the works.</li>
+<li>[Started] <strong>Provide</strong> alternate, in-I2P destinations for web sites that want to
+mirror their content within I2P.</li>
+<li>[Started] <strong>Enhance</strong> the I2P browsing experience by allowing site developers
+distribute some or all of their resources as torrents, allowing the torrents to
+be treated effectively as a CDN.</li>
+<li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP
+Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
+contextual identities. For now, the contextual identities used to manage
+browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable
+of using an outproxy but in the case of traffic destined for the clearnet
+does not do header rewriting, and Web Browsing falls back to the Proxy
+configured in Firefox. The I2P Browsing will be expanded to
+<ul>
+<li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and
+uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
+<li>I2P Social Networking: Use this for logging into social network accounts,
+forums, and other interactive asynchronous public communication platforms
+where your identity is behaviorally linkable. This has a very long
+tunnel-close timeout and key-reuse until specifically invoked.</li>
+<li>I2P Blogging: Use this for posting content to the web interface of your
+blog or to other similar websites that you create content on.</li>
+</ul></li>
+<li><img src="clearweb.png" alt="Visiting clearweb" title="" /></li>
+</ul>
 
-        <li>Also, there's a menu for accessing I2P functionality while you're browsing. It lets you control a few settings in a granular way.</li>
+<h3>Video</h3>
 
-        <li><img alt="Menu" src="menu.png" title="">
-        </li>
+<ul>
+<li><img src="i2psetproxy.js.gif" alt="Video of the plugin in action" title="" /></li>
+</ul>
 
-        <li>You can re-enable WebRTC but force it to always use the proxy that is enforced by the tab.</li>
+<h2>Documents</h2>
 
-        <li>You can either force the browser to delete all history for I2P sites immediately, or you can close all your I2P Browser tabs at once and delete the history for I2P browsing when you're done.</li>
+<ul>
+<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of
+the browser extension's feature panels in presentation form.</li>
+<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of
+the smart landing page which became the I2P home page within the browser and
+the drop-down control panel.</li>
+<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
+</ul>
 
-        <li>That's all there is to it! Your browser is configured to safely use and administer I2P.</li>
+<h2>Super Extra Important Background Info:</h2>
 
-        <li>Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the transmission-rpc interface. To do this, have a look at the torrent guide: <a href="torrent/index.html">Torrent guide</a>
-        </li>
-    </ul>
+<p>This plugin's viability is directly related to the viability of Mozilla and
+Tor's work on hardening Firefox itself and of particular interest are the
+"Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
 
-    <h3>Features</h3>
+<h3>Links about Project Uplift</h3>
 
-    <ul>
-        <li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity (container). Intercept requests to .i2p domains and automatically route them to the I2P container. Isolate the router console from other local applications by automatically intercepting requests to the router console to another container.</li>
+<ul>
+<li><a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which
+brings important features of the Tor Browser to the mainstream of Firefox
+users by including patches from Tor Browser Bundle into Firefox where it is
+appropriate.</li>
+<li><a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a>
+is a feature in Firefox and other browsers which keeps information from
+leaking across first-party domains.</li>
+<li><a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a
+technique where a tracker attempts to extract unique information about a user
+from a side-channel in order to create an identifier that can be used to
+correlate the user across many sites.</li>
+<li><a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox
+for Android and this link has some analysis of the privacy consequences of the
+Android platform.</li>
+<li><a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox
+is surveyed here.</li>
+</ul>
 
-        <li><img alt="Visiting i2p-projekt.i2p" src="i2psetproxy.js.png" title="">
-        </li>
+<p>Project uplift seems to have largely been accomplished?</p>
 
-        <li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an acceptable way to indicate it on Android.</li>
+<h3>Links about Project Fusion</h3>
 
-        <li><img alt="Visiting webmail" src="susimail.png" title="">
-        </li>
+<ul>
+<li><a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using
+Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing
+mode for Firefox which uses Tor.</li>
+<li><a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a>
+from a meeting about Fusion.</li>
+<li><a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is
+a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.</li>
+</ul>
 
-        <li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically. Provide specific configuration for other types of I2P proxies(SOCKS, isolating HTTP)</li>
+<h2>The <strong>Other</strong> Version</h2>
 
-        <li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable them with the proxy enforced.</li>
+<p>New versions of this extension create an I2P in Private Browsing mode instead,
+using container tabs.</p>
 
-        <li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in use</li>
+<p>Since this is a drastic change to the behavior of the old plugin, and since there
+is no UI a new entry
+for the new plugin has been made at a new location on addons.mozilla.org.</p>
 
-        <li><img alt="Visiting i2ptunnel" src="i2ptunnel.png" title="">
-        </li>
+<ul>
+<li><p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p></li>
+<li><p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p></li>
+</ul>
 
-        <li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+<h2>Android usage:</h2>
 
-        <li>[done] <strong>Monitor</strong> the health and readiness of the I2P router it is instructed to use. Currently the plugin checks whether the HTTP Proxy is working by fetching an image from "http://proxy.i2p" and displaying a result. A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is inert at this time.</li>
-
-        <li><img alt="Visiting toopie.html" src="toopie.png" title="">
-        </li>
-
-        <li>[Done] <strong>Handle</strong> router console applications under their own origins and within their own contextual identity. (1) The router console is automatically confined to it's own container tab. (2) Use a custom protocol handler to place each i2p application/plugin under it's own origin, shortening router console URL's and placing applications under their own origin.</li>
-
-        <li><img alt="Visiting routerconsole" src="routerconsole.png" title="">
-        </li>
-
-        <li>[Done] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then adding them directly into the Firefox downloads drop-downs, menus, etc. Enable the use of I2PSnark as a peer-to-peer delivery mechanism for media files.</li>
-
-        <li><img alt="Visiting i2psnark" src="i2psnark.png" title="">
-        </li>
-
-        <li><img alt="Monitoring torrents" src="transmissionrpc.png" title="">
-        </li>
-
-        <li><img alt="Distribute your site as a torrent." src="x-i2p-torrentlocation.png" title="">
-        </li>
-
-        <li>[Started] <strong>Indicate</strong> the level of authenticity provided by TLS. TLS is optional on I2P for now, but some sites offer it anyway. TLS support is experimental and in the works.</li>
-
-        <li>[Started] <strong>Provide</strong> alternate, in-I2P destinations for web sites that want to mirror their content within I2P.</li>
-
-        <li>[Started] <strong>Enhance</strong> the I2P browsing experience by allowing site developers distribute some or all of their resources as torrents, allowing the torrents to be treated effectively as a CDN.</li>
-
-        <li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The contextual identities. For now, the contextual identities used to manage browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable of using an outproxy but in the case of traffic destined for the clearnet does not do header rewriting, and Web Browsing falls back to the Proxy configured in Firefox. The I2P Browsing will be expanded to
-            <ul>
-                <li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
-
-                <li>I2P Social Networking: Use this for logging into social network accounts, forums, and other interactive asynchronous public communication platforms where your identity is behaviorally linkable. This has a very long tunnel-close timeout and key-reuse until specifically invoked.</li>
-
-                <li>I2P Blogging: Use this for posting content to the web interface of your blog or to other similar websites that you create content on.</li>
-            </ul>
-        </li>
-
-        <li><img alt="Visiting clearweb" src="clearweb.png" title="">
-        </li>
-    </ul>
-
-    <h3>Video</h3>
-
-    <ul>
-        <li><img alt="Video of the plugin in action" src="i2psetproxy.js.gif" title="">
-        </li>
-    </ul>
-
-    <h2>Documents</h2>
-
-    <ul>
-        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of the browser extension's feature panels in presentation form.</li>
-
-        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of the smart landing page which became the I2P home page within the browser and the drop-down control panel.</li>
-
-        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
-    </ul>
-
-    <h2>Super Extra Important Background Info:</h2>
-
-    <p>This plugin's viability is directly related to the viability of Mozilla and Tor's work on hardening Firefox itself and of particular interest are the "Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
-
-    <h3>Links about Project Uplift</h3>
-
-    <ul>
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which brings important features of the Tor Browser to the mainstream of Firefox users by including patches from Tor Browser Bundle into Firefox where it is appropriate.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a> is a feature in Firefox and other browsers which keeps information from leaking across first-party domains.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a technique where a tracker attempts to extract unique information about a user from a side-channel in order to create an identifier that can be used to correlate the user across many sites.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox for Android and this link has some analysis of the privacy consequences of the Android platform.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox is surveyed here.
-        </li>
-    </ul>
-
-    <p>Project uplift seems to have largely been accomplished?</p>
-
-    <h3>Links about Project Fusion</h3>
-
-    <ul>
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing mode for Firefox which uses Tor.
-        </li>
-
-        <li>
-            <a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a> from a meeting about Fusion.
-        </li>
-
-        <li>
-            <a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
-        </li>
-    </ul>
-
-    <h2>The <strong>Other</strong> Version</h2>
-
-    <p>New versions of this extension create an I2P in Private Browsing mode instead, using container tabs.</p>
-
-    <p>Since this is a drastic change to the behavior of the old plugin, and since there is no UI a new entry for the new plugin has been made at a new location on addons.mozilla.org.</p>
-
-    <ul>
-        <li>
-            <p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p>
-        </li>
-
-        <li>
-            <p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p>
-        </li>
-    </ul>
-
-    <h2>Android usage:</h2>
-
-    <p>Use the old version, on either an old version of Firefox(pre-68) or by enabling this custom collection: [Recommended Plugins] https://addons.mozilla.org/en-US/firefox/collections/14614396/I2P-Browser-Fork/</p>
+<p>Use the old version, on either an old version of Firefox(pre-68) or by enabling
+this custom collection: [Recommended Plugins] https://addons.mozilla.org/en-US/firefox/collections/14614396/I2P-Browser-Fork/</p>
 </body>
 </html>

manifest.json

@@ -27,7 +27,7 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.89",
+  "version": "0.95",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {

options/options.js

@@ -34,15 +34,15 @@ function SetControlHelpText() {
 }
 
 function getBookmarksCreated() {
-  bookmarks_state = document.getElementById('bookmarks').value;
+  bookmarks_state = document.getElementById('bookmarks');
   console.log('(options)Got i2p bookmarks state:', bookmarks_state);
   if (bookmarks_state == undefined) {
     return false;
   }
-  if (bookmarks_state == 'false') {
+  if (bookmarks_state.value == 'false') {
     return false;
   }
-  if (bookmarks_state == 'true') {
+  if (bookmarks_state.value == 'true') {
     return true;
   }
   return false;

privacy.js

@@ -417,27 +417,37 @@ function forgetBrowsingData(storedSettings) {
 function i2pHostName(url) {
   let hostname = "";
   console.log("(hosts)", url);
-  if (url.includes("=")) {
+  let u = new URL(url);
+  if (u.host.endsWith(".i2p")) {
+    hostname = u.host;
+  } else if (url.includes("=")) {
+    console.log("(hosts) scrub 1", url);
     if (url.includes(".i2p")) {
       lsit = url.split("=");
+      console.log("(hosts) scrub 2", hostname);
       for (let item in lsit) {
-        var items = lsit[item].split(`\%`); //"\%")
+        var items = lsit[item].split(`\ % `); //"\%")
         for (let p in items) {
           if (items[p].includes(".i2p")) {
             hostname = items[p].replace("3D", 1);
           }
+          console.log("(hosts) scrub 3", hostname);
           break;
         }
         if (hostname != "") {
+          console.log("(hosts) scrub 4", hostname);
           break;
         }
       }
     }
   } else if (url.indexOf("://") > -1) {
     hostname = url.split("/")[2];
+    console.log("(hosts) scrub 5", hostname);
   } else {
     hostname = url.split("/")[0];
+    console.log("(hosts) scrub 6", hostname);
   }
+  console.log("(hosts) scrub 7", hostname);
   return hostname;
 }
 

proxy.js

@@ -81,9 +81,11 @@ var handleContextProxyRequest = async function(requestDetails) {
   try {
     var handleProxyRequest = function(context) {
       proxy = {
-        failoverTimeout: 0,
-        proxyDns: false,
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
       };
+
       if (context == 'firefox-default' || context == 'firefox-private') {
         proxy = null;
         return proxy;
@@ -120,13 +122,17 @@ var handleContextProxyRequest = async function(requestDetails) {
               );
             }
           }
-        } else if (i2pHost(requestDetails.url)) {
+        }
+        if (i2pHost(requestDetails.url)) {
           proxy = {
             type: getScheme(),
             host: getHost(),
             port: getPort(),
           };
         }
+        if (requestDetails.url.includes('rpc')){
+          console.log("(proxy for rpc url)", rpc)
+        }
         //var tab = tabGet(requestDetails.tabId);
         //tab.then(handleTabRequest,)
         return proxy;
@@ -336,7 +342,7 @@ function getConsolePort() {
 function setupProxy() {
   console.log('Setting up Firefox WebExtension proxy');
   browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ['*://*.i2p/*', '*://localhost/*', '*://127.0.0.1/*', '*://*/*i2p*'],
+    urls: ['<all_urls>'],
   });
   console.log('i2p settings created for WebExtension Proxy');
 }

releases.atom

@@ -4,13 +4,70 @@
   <link type="text/html" rel="alternate" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases"/>
   <link type="application/atom+xml" rel="self" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom"/>
   <title>Release notes from I2P-in-Private-Browsing-Mode-Firefox</title>
-  <updated>2020-12-13T19:07:10Z</updated>
+  <updated>2020-12-21T23:13:19Z</updated>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.95</id>
+    <updated>2020-12-21T23:21:35Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.95"/>
+    <title>0.95</title>
+    <enclosure url="magnet:?xt=urn:btih:7ec361c3ddc3fb904e369a19cdf4259af94af624" type="application/x-bittorrent" />
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix github &lt;a class=&quot;issue-link js-issue-link&quot; data-error-text=&quot;Failed to load title&quot; data-id=&quot;763036769&quot; data-permission-text=&quot;Title is private&quot; data-url=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/102&quot; data-hovercard-type=&quot;issue&quot; data-hovercard-url=&quot;/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/102/hovercard&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/102&quot;&gt;#102&lt;/a&gt; and &lt;a class=&quot;issue-link js-issue-link&quot; data-error-text=&quot;Failed to load title&quot; data-id=&quot;763043125&quot; data-permission-text=&quot;Title is private&quot; data-url=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/103&quot; data-hovercard-type=&quot;issue&quot; data-hovercard-url=&quot;/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/103/hovercard&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/103&quot;&gt;#103&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 21 DEC 2020 6:15:05 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.93-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.93</id>
+    <updated>2020-12-14T22:20:08Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.93"/>
+    <title>0.93</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.93-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Emergency fix of the first one&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 14 DEC 2020 5:18:53 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.91-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.91</id>
+    <updated>2020-12-14T19:47:59Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.91"/>
+    <title>0.91</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.91-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Exclude clearnet code hosting sites from scrub checks&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 14 DEC 2020 2:46:23 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.89-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
   <entry>
     <id>tag:github.com,2008:Repository/169256012/0.89</id>
     <updated>2020-12-13T19:11:13Z</updated>
     <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.89"/>
     <title>0.89</title>
-    <enclosure url="magnet:?xt=urn:btih:7c941672fd7b36cbb2cec817549616ef51d70bfd" type="application/x-bittorrent" />
     <content type="html">&lt;p&gt;============================&lt;/p&gt;
 &lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
@@ -137,63 +194,4 @@ i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;
     </author>
     <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
   </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.75</id>
-    <updated>2020-06-23T03:22:59Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.75"/>
-    <title>0.75</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.75-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Update bookmarks format&lt;/li&gt;
-&lt;li&gt;Deprecate WebRTC State Management&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 22 JUN 2020 11:22:37 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.73-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.73</id>
-    <updated>2020-03-24T23:49:45Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.73"/>
-    <title>0.73</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.73-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69 again&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Tue, 24 MAR 2020 19:48:14 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.71-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.71</id>
-    <updated>2020-03-24T23:01:20Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.71"/>
-    <title>0.71</title>
-    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
-&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.71-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Tue, 24 MAR 2020 0:19:59 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.69-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
 </feed>

scrub.js

@@ -489,80 +489,6 @@ var contextSetup = function(requestDetails) {
         console.log('(isolate)Context Error', error);
       }
     };
-    var normalTabFind = async function(tabId) {
-      if (tabId == undefined) {
-        return;
-      }
-      try {
-        var anoncontext = await browser.contextualIdentities.query({
-          name: titlepref,
-        });
-        var irccontext = await browser.contextualIdentities.query({
-          name: ircpref,
-        });
-        var othercontexts = await notMyContextNotMyProblem();
-        var nmp = false;
-        for (context in othercontexts) {
-          if (tabId.cookieStoreId == othercontexts[context].cookieStoreId) {
-            console.log('Not my problem');
-            nmp = true;
-          }
-        }
-        if (
-          tabId.cookieStoreId == 'firefox-default' ||
-          tabId.cookieStoreId == 'firefox-private' ||
-          tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
-          tabId.cookieStoreId == irccontext[0].cookieStoreId ||
-          nmp
-        ) {
-          console.log(
-            '(ISOLATE)',
-            tabId.cookieStoreId,
-            'not',
-            anoncontext[0].cookieStoreId,
-            irccontext[0].cookieStoreId
-          );
-          return;
-        } else {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab() {
-                if (
-                  tabId.id != tab.id &&
-                  tabId.cookieStoreId != tab.cookieStoreId
-                ) {
-                  console.log(
-                    '(isolate) Closing isolated tab',
-                    tabId.id,
-                    'with context',
-                    tabId.cookieStoreId
-                  );
-                  console.log(
-                    '(isolate) in favor of',
-                    tab.id,
-                    'with context',
-                    tab.cookieStoreId
-                  );
-                  browser.tabs.remove(tabId.id);
-                }
-              }
-              closeOldTab(tab);
-            }
-            var created = browser.tabs.create({
-              active: true,
-              cookieStoreId: 'firefox-default',
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
-      } catch (error) {
-        console.log('(isolate)Context Error', error);
-      }
-    };
     var tabGet = async function(tabId) {
       try {
         //console.log("(isolate)Tab ID from Request", tabId);
@@ -588,36 +514,8 @@ var contextSetup = function(requestDetails) {
     if (requestDetails.tabId > 0) {
       var tab = tabGet(requestDetails.tabId);
       tab.then(isolate);
+
       function isolate(oldtab) {
-        //        if (oldtab.cookieStoreId == 'firefox-default') {
-        if (i2pHost(requestDetails.url)) {
-          var thn = i2pHostName(requestDetails.url);
-          if (requestDetails.url.includes('=' + thn)) {
-            if (
-              !requestDetails.url.includes('github.com') ||
-              !requestDetails.url.includes('notabug.org') ||
-              !requestDetails.url.includes('i2pgit.org') ||
-              !requestDetails.url.includes('gitlab.com')
-            ) {
-              console.log('(scrub)checking search hostnames =' + thn);
-              var tpt = requestDetails.url.split('=' + thn, 2);
-              requestDetails.url =
-                'http://' + thn + '/' + tpt[1].replace('%2F', '');
-            }
-          }
-          console.log('(scrub) new hostname', requestDetails.url);
-          var setcookie = browser.cookies.set({
-            firstPartyDomain: i2pHostName(requestDetails.url),
-            url: requestDetails.url,
-            secure: true,
-          });
-          setcookie.then(onContextGotLog, onContextError);
-          var i2ptab = tab.then(i2pTabFind, onContextError);
-          return requestDetails;
-        }
-        if (extensionHost(requestDetails)) {
-          return requestDetails;
-        }
         let localhost = localHost(requestDetails.url);
         let routerhost = routerHost(requestDetails.url);
         if (routerhost) {
@@ -645,10 +543,41 @@ var contextSetup = function(requestDetails) {
             var irctab = tab.then(ircTabFind, onContextError);
             return requestDetails;
           }
-          var normalTab = tab.then(normalTabFind, onContextError);
-          return requestDetails;
-          //return requestDetails;
         }
+        //        if (oldtab.cookieStoreId == 'firefox-default') {
+        if (i2pHost(requestDetails.url)) {
+          var thn = i2pHostName(requestDetails.url);
+          if (requestDetails.url.includes('=' + thn)) {
+            if (
+              !requestDetails.url.includes('://github.com') ||
+              !requestDetails.url.includes('://notabug.org') ||
+              !requestDetails.url.includes('://i2pgit.org') ||
+              !requestDetails.url.includes('://gitlab.com')
+            ) {
+              if (!localhost) {
+                console.log('(scrub)checking search hostnames =' + thn);
+                var tpt = requestDetails.url.split('=' + thn, 2);
+                requestDetails.url =
+                  'http://' + thn + '/' + tpt[1].replace('%2F', '');
+              }
+            }
+          }
+          console.log('(scrub) new hostname', requestDetails.url);
+          var setcookie = browser.cookies.set({
+            firstPartyDomain: i2pHostName(requestDetails.url),
+            url: requestDetails.url,
+            secure: true,
+          });
+          setcookie.then(onContextGotLog, onContextError);
+          if (!routerhost) {
+            var i2ptab = tab.then(i2pTabFind, onContextError);
+          }
+          return requestDetails;
+        }
+        if (extensionHost(requestDetails)) {
+          return requestDetails;
+        }
+
         //}
       }
     }

torrent/popup.js

@@ -11,8 +11,11 @@ var TrpcCall = async function(meth, args) {
     myHeaders['Authorization'] =
       'Basic ' + btoa((server.username || '') + ':' + (server.btrpcpass || ''));
   }
-  console.log('(torrent) rpcurl', server.base_url + 'rpc');
-  return fetch(server.base_url + 'rpc', {
+
+  let req_url = server.bt_rpc_host
+  if (server.bt_rpc_port != 0) req_url += ":"+server.bt_rpc_port
+  console.log('(torrent) rpcurl', req_url);
+  return fetch(req_url + 'rpc', {
     method: 'POST',
     headers: myHeaders,
     body: JSON.stringify({ method: meth, arguments: args }),