refactor: linting + deleting clogs

.github/workflows/build.yaml

@@ -0,0 +1,46 @@
+name: build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: npm run build

.github/workflows/ci.yaml

@@ -1,72 +0,0 @@
-name: ci
-
-on:
-  pull_request:
-  release:
-    types: [published]
-
-jobs:
-  build-lint-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build
-        run: npm run build
-
-      - name: Lint
-        run: npm run lint
-
-      - name: Test Webpack Build
-        run: npm run build:webpack
-
-      - name: Save extension zip file for releases
-        if: github.event_name == 'release'
-        uses: actions/upload-artifact@v4
-        with:
-          name: tlsn-extension-${{ github.ref_name }}.zip
-          path: ./zip/tlsn-extension-${{ github.ref_name }}.zip
-          if-no-files-found: error
-
-  release:
-    if: github.event_name == 'release'
-    runs-on: ubuntu-latest
-    needs: build-lint-test
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Download extension from build-lint-test job
-        uses: actions/download-artifact@v4
-        with:
-          name: tlsn-extension-${{ github.ref_name }}.zip
-          path: .
-
-      - name: 📦 Add extension zip file to release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload "${{ github.event.release.tag_name }}" \
-            ./tlsn-extension-${{ github.ref_name }}.zip \
-            --clobber
-
-      # Get tokens as documented on 
-      # * https://developer.chrome.com/docs/webstore/using-api#beforeyoubegin
-      # * https://github.com/fregante/chrome-webstore-upload-keys?tab=readme-ov-file
-      - name: 💨 Publish to chrome store
-        uses: browser-actions/release-chrome-extension@latest # https://github.com/browser-actions/release-chrome-extension/tree/latest/
-        with:
-          extension-id: "gcfkkledipjbgdbimfpijgbkhajiaaph"
-          extension-path: tlsn-extension-${{ github.ref_name }}.zip
-          oauth-client-id: ${{ secrets.OAUTH_CLIENT_ID }}
-          oauth-client-secret: ${{ secrets.OAUTH_CLIENT_SECRET }}
-          oauth-refresh-token: ${{ secrets.OAUTH_REFRESH_TOKEN }}

.github/workflows/lint.yaml

@@ -0,0 +1,46 @@
+name: lint
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Lint
+        run: npm run lint

.gitignore

@@ -8,4 +8,3 @@ bin/
 build
 tlsn/
 zip
-.vscode

README.md

@@ -12,7 +12,7 @@
 # Chrome Extension (MV3) for TLSNotary
 
 > [!IMPORTANT]
-> ⚠️ When running the extension against a [notary server](https://github.com/tlsnotary/tlsn/tree/main/crates/notary/server), please ensure that the server's version is the same as the version of this extension
+> ⚠️ When running the extension against a [notary server](https://github.com/tlsnotary/tlsn/tree/dev/notary-server), please ensure that the server's version is the same as the version of this extension
 
 ## License
 This repository is licensed under either of
@@ -25,11 +25,7 @@ at your option.
 
 ## Installing and Running
 
-The easiest way to install the TLSN browser extension is to use the [Chrome Web Store](https://chromewebstore.google.com/detail/tlsn-extension/gcfkkledipjbgdbimfpijgbkhajiaaph).
-
-You can also build and run it locally as explained in the following steps.
-
-### Procedure:
+### Procedures:
 
 1. Check if your [Node.js](https://nodejs.org/) version is >= **18**.
 2. Clone this repository.
@@ -46,7 +42,7 @@ You can also build and run it locally as explained in the following steps.
 ```
 $ git clone https://github.com/novnc/websockify && cd websockify
 $ ./docker/build.sh
-$ docker run -it --rm -p 55688:80 novnc/websockify 80 api.x.com:443
+$ docker run -it --rm -p 55688:80 novnc/websockify 80 api.twitter.com:443
 ```
 
 ## Running Websockify Docker Image

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsn-extension",
-  "version": "0.1.0.1200",
+  "version": "0.1.0.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@extism/extism": "^2.0.0-rc11",
+    "@extism/extism": "^1.0.2",
     "@fortawesome/fontawesome-free": "^6.4.2",
     "async-mutex": "^0.4.0",
     "buffer": "^6.0.3",
@@ -24,12 +24,9 @@
     "classnames": "^2.3.2",
     "comlink": "^4.4.1",
     "copy-to-clipboard": "^3.3.3",
-    "dayjs": "^1.11.13",
     "fast-deep-equal": "^3.1.3",
     "fuse.js": "^6.6.2",
-    "http-parser-js": "^0.5.9",
     "level": "^8.0.0",
-    "minimatch": "^9.0.4",
     "node-cache": "^5.1.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -40,7 +37,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2",
     "tailwindcss": "^3.3.3",
-    "tlsn-js": "0.1.0-alpha.12.0"
+    "tlsn-js": "0.1.0-alpha.5.3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.12",

plugins/README.md

@@ -0,0 +1,48 @@
+# Plugin Development for the TLSNotary Browser Extension
+
+This folder is dedicated to the development of plugins for the TLSNotary browser extension, utilizing the Extism framework. Currently, the folder includes a TypeScript-based plugin example, `twitter_profile`, with plans to add more plugins showcasing different programming languages and functionalities.
+
+## Installation of Extism-js
+
+1. **Download and Install Extism-js**: Begin by setting up `extism-js`, which enables you to compile and manage your plugins. Run these commands to download and install it:
+
+    ```sh
+    curl -O https://raw.githubusercontent.com/extism/js-pdk/main/install.sh
+    sh install.sh
+    ```
+
+    This script installs the Extism JavaScript Plugin Development Kit from its GitHub repository, preparing your environment for plugin compilation.
+
+## Building the Twitter Profile Plugin
+
+Navigate to the `twitter_profile` directory within this folder and run the following command to build the plugin:
+
+```sh
+extism-js index.js -i index.d.ts -o index.wasm
+```
+This command compiles the TypeScript code in index.js into a WebAssembly module, ready for integration with the TLSNotary extension.
+
+### Running the Twitter Plugin Example:
+
+1.	Build the `twitter_profile` plugin as explained above.
+2.	Build and install the `tlsn-extension` as documented in the [main README.md](../README.md).
+3.	[Run a local notary server](https://github.com/tlsnotary/tlsn/blob/main/notary-server/README.md), ensuring `TLS` is disabled in the [config file](https://github.com/tlsnotary/tlsn/blob/main/notary-server/config/config.yaml#L18).
+4.	Install the plugin: Click the **Add a Plugin (+)** button and select the `index.wasm` file you built in step 1. A **Twitter Profile** button should then appear below the default buttons.
+5.	Click the **Twitter Profile** button. This action opens the Twitter webpage along with a TLSNotary sidebar.
+6.	Follow the steps in the TLSNotary sidebar.
+7.	Access the TLSNotary results by clicking the **History** button in the TLSNotary extension.
+
+## Future Plugins
+
+This directory will be expanded with more plugins designed to demonstrate the functionality of the TLSNotary extension. Plugins enable flexible use of the TLSNotary across a broad range of applications. The use of Extism facilitates plugin development in various languages, further enhancing flexibility.
+
+## Create an icon
+
+1. resize to 320x320 pixels:
+    ```sh
+    convert icon.png -resize 320x320! icon_320.png
+    ```
+2. convert to base64
+    ```sh
+    base64 -i icon_320.png -o icon_320.txt
+    ```

plugins/hello/hello.d.ts

@@ -0,0 +1,4 @@
+declare module 'main' {
+  // Extism exports take no params and return an I32
+  export function hello(): I32;
+}

plugins/hello/hello.js

@@ -0,0 +1,6 @@
+function hello() {
+  const name = Host.inputString();
+  Host.outputString(`Hello, ${name}`);
+}
+
+module.exports = { hello };

plugins/reddit/index.d.ts

@@ -0,0 +1,14 @@
+declare module 'main' {
+  // Extism exports take no params and return an I32
+  export function start(): I32;
+  export function two(): I32;
+  export function three(): I32;
+  export function config(): I32;
+}
+
+declare module 'extism:host' {
+  interface user {
+    redirect(ptr: I64): void;
+    notarize(ptr: I64): I64;
+  }
+}

plugins/twitter_profile/index.d.ts

@@ -0,0 +1,14 @@
+declare module 'main' {
+  // Extism exports take no params and return an I32
+  export function start(): I32;
+  export function two(): I32;
+  export function three(): I32;
+  export function config(): I32;
+}
+
+declare module 'extism:host' {
+  interface user {
+    redirect(ptr: I64): void;
+    notarize(ptr: I64): I64;
+  }
+}

src/assets/img/dot-menu.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" ?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" id="Glyph" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M16,13c-1.654,0-3,1.346-3,3s1.346,3,3,3s3-1.346,3-3S17.654,13,16,13z" id="XMLID_287_"/><path d="M6,13c-1.654,0-3,1.346-3,3s1.346,3,3,3s3-1.346,3-3S7.654,13,6,13z" id="XMLID_289_"/><path d="M26,13c-1.654,0-3,1.346-3,3s1.346,3,3,3s3-1.346,3-3S27.654,13,26,13z" id="XMLID_291_"/></svg>

src/components/ConnectionDetailsModal/index.tsx

@@ -1,70 +0,0 @@
-import React, { useCallback, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import {
-  useActiveTabUrl,
-  setConnection,
-  useIsConnected,
-} from '../../reducers/requests';
-import Modal, { ModalHeader, ModalContent } from '../../components/Modal/Modal';
-import { deleteConnection, getConnection } from '../../entries/Background/db';
-
-const ConnectionDetailsModal = (props: {
-  showConnectionDetails: boolean;
-  setShowConnectionDetails: (show: boolean) => void;
-}) => {
-  const dispatch = useDispatch();
-  const activeTabOrigin = useActiveTabUrl();
-  const connected = useIsConnected();
-
-  useEffect(() => {
-    (async () => {
-      if (activeTabOrigin) {
-        const isConnected: boolean | null = await getConnection(
-          activeTabOrigin.origin,
-        );
-        dispatch(setConnection(!!isConnected));
-      }
-    })();
-  }, [activeTabOrigin, dispatch]);
-
-  const handleDisconnect = useCallback(async () => {
-    if (activeTabOrigin?.origin) {
-      await deleteConnection(activeTabOrigin.origin);
-      props.setShowConnectionDetails(false);
-      dispatch(setConnection(false));
-    }
-  }, [activeTabOrigin?.origin, dispatch, props]);
-
-  return (
-    <Modal
-      onClose={() => props.setShowConnectionDetails(false)}
-      className="flex flex-col gap-2 items-center text-base cursor-default justify-center mx-4 min-h-24"
-    >
-      <ModalHeader
-        className="w-full rounded-t-lg pb-0 border-b-0"
-        onClose={() => props.setShowConnectionDetails(false)}
-      >
-        <span className="text-lg font-semibold">
-          {activeTabOrigin?.hostname || 'Connections'}
-        </span>
-      </ModalHeader>
-      <ModalContent className="w-full gap-2 flex-grow flex flex-col items-center justify-between px-4 pt-0 pb-4">
-        <div className="flex flex-row gap-2 items-start w-full text-xs font-semibold text-slate-800">
-          {connected
-            ? 'TLSN Extension is connected to this site.'
-            : 'TLSN Extension is not connected to this site. To connect to this site, find and click the connect button.'}
-        </div>
-        {connected && (
-          <button
-            className="button disabled:opacity-50 self-end"
-            onClick={handleDisconnect}
-          >
-            Disconnect
-          </button>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default ConnectionDetailsModal;

src/components/Menu/index.tsx

@@ -1,114 +0,0 @@
-import React, {
-  MouseEventHandler,
-  ReactElement,
-  ReactNode,
-  useCallback,
-  useState,
-} from 'react';
-import Icon from '../Icon';
-import browser from 'webextension-polyfill';
-import classNames from 'classnames';
-import { useNavigate } from 'react-router';
-
-export function MenuIcon(): ReactElement {
-  const [opened, setOpen] = useState(false);
-
-  const toggleMenu = useCallback(() => {
-    setOpen(!opened);
-  }, [opened]);
-
-  return (
-    <div className="relative">
-      {opened && (
-        <>
-          <div
-            className="fixed top-0 left-0 w-screen h-screen z-10"
-            onClick={toggleMenu}
-          />
-          <Menu opened={opened} setOpen={setOpen} />
-        </>
-      )}
-      <Icon
-        fa="fa-solid fa-bars"
-        className="text-slate-500 hover:text-slate-700 active:text-slate-900 cursor-pointer z-20"
-        onClick={toggleMenu}
-      />
-    </div>
-  );
-}
-
-export default function Menu(props: {
-  opened: boolean;
-  setOpen: (opened: boolean) => void;
-}): ReactElement {
-  const navigate = useNavigate();
-  const openExtensionInPage = () => {
-    props.setOpen(false);
-    browser.tabs.create({
-      url: `chrome-extension://${chrome.runtime.id}/popup.html`,
-    });
-  };
-
-  return (
-    <div className="absolute top-[100%] right-0 rounded-md z-20">
-      <div className="flex flex-col bg-slate-200 w-40 shadow rounded-md py">
-        <MenuRow
-          fa="fa-solid fa-hammer"
-          className="relative"
-          onClick={() => {
-            navigate('/custom');
-            props.setOpen(false);
-          }}
-        >
-          <span>Custom</span>
-        </MenuRow>
-        <MenuRow
-          fa="fa-solid fa-certificate"
-          className="relative"
-          onClick={() => {
-            props.setOpen(false);
-            navigate('/verify');
-          }}
-        >
-          Verify
-        </MenuRow>
-        <MenuRow
-          className="lg:hidden"
-          fa="fa-solid fa-up-right-and-down-left-from-center"
-          onClick={openExtensionInPage}
-        >
-          Expand
-        </MenuRow>
-        <MenuRow
-          fa="fa-solid fa-gear"
-          onClick={() => {
-            props.setOpen(false);
-            navigate('/options');
-          }}
-        >
-          Options
-        </MenuRow>
-      </div>
-    </div>
-  );
-}
-
-function MenuRow(props: {
-  fa: string;
-  children?: ReactNode;
-  onClick?: MouseEventHandler;
-  className?: string;
-}): ReactElement {
-  return (
-    <div
-      className={classNames(
-        'flex flex-row items-center py-3 px-4 gap-2 hover:bg-slate-300 cursor-pointer text-slate-800 hover:text-slate-900 font-semibold',
-        props.className,
-      )}
-      onClick={props.onClick}
-    >
-      <Icon size={0.875} fa={props.fa} />
-      {props.children}
-    </div>
-  );
-}

src/components/Modal/Modal.tsx

@@ -37,19 +37,13 @@ export default function Modal(props: Props): ReactElement {
 }
 
 type HeaderProps = {
-  className?: string;
   onClose?: () => void;
-  children?: ReactNode;
+  children: ReactNode;
 };
 
 export function ModalHeader(props: HeaderProps): ReactElement {
   return (
-    <div
-      className={classNames(
-        'border-b modal__header border-gray-100',
-        props.className,
-      )}
-    >
+    <div className={classNames('border-b modal__header border-gray-100')}>
       <div className="modal__header__title">{props.children}</div>
       <div className="modal__header__content">
         {props.onClose && (

src/components/PluginInfo/index.scss

@@ -1,20 +0,0 @@
-.custom-modal {
-  height: 100%;
-  max-width: 800px;
-  max-height: 100vh;
-  display: flex;
-  margin: 0 auto;
-  flex-direction: column;
-}
-
-.custom-modal-content {
-  flex-grow: 2;
-  overflow-y: auto;
-  max-height: 90%;
-}
-
-.modal__overlay {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}

src/components/PluginInfo/index.tsx

@@ -1,154 +0,0 @@
-import React, { Children, MouseEventHandler, ReactNode } from 'react';
-import Modal, {
-  ModalHeader,
-  ModalContent,
-  ModalFooter,
-} from '../../components/Modal/Modal';
-import type { PluginConfig } from '../../utils/misc';
-import './index.scss';
-import logo from '../../assets/img/icon-128.png';
-import {
-  HostFunctionsDescriptions,
-  MultipleParts,
-  PermissionDescription,
-} from '../../utils/plugins';
-import classNames from 'classnames';
-import DefaultPluginIcon from '../../assets/img/default-plugin-icon.png';
-
-export function PluginInfoModalHeader(props: {
-  className?: string;
-  children: ReactNode | ReactNode[];
-}) {
-  return <div className={props.className}>{props.children}</div>;
-}
-
-export function PluginInfoModalContent(props: {
-  className?: string;
-  children: ReactNode | ReactNode[];
-}) {
-  return <div className={props.className}>{props.children}</div>;
-}
-
-export function PluginInfoModal(props: {
-  pluginContent: PluginConfig;
-  onClose: () => void;
-  onAddPlugin?: MouseEventHandler;
-  children?: ReactNode | ReactNode[];
-}) {
-  const { pluginContent, onClose, onAddPlugin, children } = props;
-
-  const header = Children.toArray(children).filter(
-    (c: any) => c.type.name === 'PluginInfoModalHeader',
-  )[0];
-
-  const content = Children.toArray(children).filter(
-    (c: any) => c.type.name === 'PluginInfoModalContent',
-  )[0];
-
-  return (
-    <Modal
-      onClose={onClose}
-      className="custom-modal !rounded-none flex items-center justify-center gap-4 cursor-default"
-    >
-      <ModalHeader className="w-full p-2 border-gray-200 text-gray-500">
-        {header || (
-          <div className="flex flex-row items-end justify-start gap-2">
-            <img className="h-5" src={logo || DefaultPluginIcon} alt="logo" />
-            <span className="font-semibold">{`Installing ${pluginContent.title}`}</span>
-          </div>
-        )}
-      </ModalHeader>
-      <ModalContent className="flex flex-col flex-grow-0 flex-shrink-0 items-center px-8 py-2 gap-2 w-full max-h-none">
-        {content || (
-          <>
-            <img
-              className="w-12 h-12"
-              src={pluginContent.icon || DefaultPluginIcon}
-              alt="Plugin Icon"
-            />
-            <span className="text-3xl text-center">
-              <span>
-                <span className="text-blue-600 font-semibold">
-                  {pluginContent.title}
-                </span>{' '}
-                wants access to your browser
-              </span>
-            </span>
-          </>
-        )}
-      </ModalContent>
-      <div className="flex-grow flex-shrink overflow-y-auto w-full px-8">
-        <PluginPermissions pluginContent={pluginContent} />
-      </div>
-      <ModalFooter className="flex justify-end gap-2 p-4">
-        <button className="button" onClick={onClose}>
-          Cancel
-        </button>
-        {onAddPlugin && (
-          <button className="button button--primary" onClick={onAddPlugin}>
-            Allow
-          </button>
-        )}
-      </ModalFooter>
-    </Modal>
-  );
-}
-
-export function PluginPermissions({
-  pluginContent,
-  className,
-}: {
-  pluginContent: PluginConfig;
-  className?: string;
-}) {
-  return (
-    <div className={classNames('flex flex-col p-2 gap-5', className)}>
-      {pluginContent.hostFunctions?.map((hostFunction: string) => {
-        const HFComponent = HostFunctionsDescriptions[hostFunction];
-        return <HFComponent key={hostFunction} {...pluginContent} />;
-      })}
-      {pluginContent.cookies && (
-        <PermissionDescription fa="fa-solid fa-cookie-bite">
-          <span className="cursor-default">
-            <span className="mr-1">Access cookies from</span>
-            <MultipleParts parts={pluginContent.cookies} />
-          </span>
-        </PermissionDescription>
-      )}
-      {pluginContent.headers && (
-        <PermissionDescription fa="fa-solid fa-envelope">
-          <span className="cursor-default">
-            <span className="mr-1">Access headers from</span>
-            <MultipleParts parts={pluginContent.headers} />
-          </span>
-        </PermissionDescription>
-      )}
-      {pluginContent.localStorage && (
-        <PermissionDescription fa="fa-solid fa-database">
-          <span className="cursor-default">
-            <span className="mr-1">Access local storage storage from</span>
-            <MultipleParts parts={pluginContent.localStorage} />
-          </span>
-        </PermissionDescription>
-      )}
-      {pluginContent.sessionStorage && (
-        <PermissionDescription fa="fa-solid fa-database">
-          <span className="cursor-default">
-            <span className="mr-1">Access session storage from</span>
-            <MultipleParts parts={pluginContent.sessionStorage} />
-          </span>
-        </PermissionDescription>
-      )}
-      {pluginContent.requests && (
-        <PermissionDescription fa="fa-solid fa-globe">
-          <span className="cursor-default">
-            <span className="mr-1">Submit network requests to</span>
-            <MultipleParts
-              parts={pluginContent?.requests.map(({ url }) => url)}
-            />
-          </span>
-        </PermissionDescription>
-      )}
-    </div>
-  );
-}

src/components/PluginList/index.scss

@@ -6,7 +6,6 @@
     padding: 0;
     overflow: hidden;
     transition: 200ms opacity;
-    transition-delay: 200ms;
   }
 
   &:hover {
@@ -21,25 +20,4 @@
       }
     }
   }
-}
-.custom-modal {
-  width: 100vw;
-  height: 100vh;
-  max-width: 800px;
-  max-height: 90vh;
-  display: flex;
-  margin: 1rem auto;
-  flex-direction: column;
-}
-
-.custom-modal-content {
-  flex-grow: 2;
-  overflow-y: auto;
-  max-height: 90%;
-}
-
-.modal__overlay {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+}

src/components/PluginList/index.tsx

@@ -1,4 +1,5 @@
 import React, {
+  ChangeEvent,
   MouseEventHandler,
   ReactElement,
   useCallback,
@@ -8,305 +9,105 @@ import React, {
 import {
   fetchPluginHashes,
   removePlugin,
+  fetchPluginConfigByHash,
   runPlugin,
-  addPlugin,
 } from '../../utils/rpc';
 import { usePluginHashes } from '../../reducers/plugins';
-import {
-  getPluginConfig,
-  hexToArrayBuffer,
-  PluginConfig,
-} from '../../utils/misc';
+import { PluginConfig } from '../../utils/misc';
 import DefaultPluginIcon from '../../assets/img/default-plugin-icon.png';
 import classNames from 'classnames';
 import Icon from '../Icon';
 import './index.scss';
 import browser from 'webextension-polyfill';
 import { ErrorModal } from '../ErrorModal';
-import {
-  PluginInfoModal,
-  PluginInfoModalContent,
-  PluginInfoModalHeader,
-} from '../PluginInfo';
-import { getPluginConfigByUrl } from '../../entries/Background/db';
-import { SidePanelActionTypes } from '../../entries/SidePanel/types';
-import { openSidePanel } from '../../entries/utils';
 
-export function PluginList({
-  className,
-  unremovable,
-  onClick,
-  showAddButton = false,
-}: {
-  className?: string;
-  unremovable?: boolean;
-  onClick?: (hash: string) => void;
-  showAddButton?: boolean;
-}): ReactElement {
+export function PluginList(props: { className?: string }): ReactElement {
   const hashes = usePluginHashes();
-  const [uploading, setUploading] = useState(false);
 
   useEffect(() => {
     fetchPluginHashes();
   }, []);
 
-  const handleFileUpload = useCallback(
-    async (e: React.ChangeEvent<HTMLInputElement>) => {
-      const file = e.target.files?.[0];
-      if (!file) return;
-
-      if (!file.name.endsWith('.wasm')) {
-        alert('Please select a .wasm file');
-        return;
-      }
-
-      setUploading(true);
-      try {
-        const arrayBuffer = await file.arrayBuffer();
-        const hex = Buffer.from(arrayBuffer).toString('hex');
-        const url = `file://${file.name}`;
-
-        await addPlugin(hex, url);
-        await fetchPluginHashes();
-      } catch (error: any) {
-        alert(`Failed to add plugin: ${error.message}`);
-      } finally {
-        setUploading(false);
-        e.target.value = '';
-      }
-    },
-    [],
-  );
-
   return (
-    <div className={classNames('flex flex-col flex-nowrap gap-1', className)}>
-      {showAddButton && (
-        <div className="relative">
-          <input
-            type="file"
-            accept=".wasm"
-            onChange={handleFileUpload}
-            disabled={uploading}
-            className="absolute inset-0 w-full h-full opacity-0 cursor-pointer z-10"
-          />
-          <button
-            className="flex flex-row items-center justify-center gap-2 p-3 border-2 border-dashed border-slate-300 rounded-lg text-slate-500 hover:text-slate-700 hover:border-slate-400 transition-colors cursor-pointer w-full"
-            disabled={uploading}
-          >
-            {uploading ? (
-              <>
-                <Icon fa="fa-solid fa-spinner" className="animate-spin" />
-                <span>Adding Plugin...</span>
-              </>
-            ) : (
-              <>
-                <Icon fa="fa-solid fa-plus" />
-                <span>Add Plugin (.wasm file)</span>
-              </>
-            )}
-          </button>
-        </div>
-      )}
-      {!hashes.length && !showAddButton && (
+    <div className={classNames('flex flex-col flex-nowrap', props.className)}>
+      {!hashes.length && (
         <div className="flex flex-col items-center justify-center text-slate-400 cursor-default select-none">
           <div>No available plugins</div>
         </div>
       )}
       {hashes.map((hash) => (
-        <Plugin
-          key={hash}
-          hash={hash}
-          unremovable={unremovable}
-          onClick={onClick}
-        />
+        <Plugin key={hash} hash={hash} />
       ))}
     </div>
   );
 }
 
-export function Plugin({
-  hash,
-  hex,
-  unremovable,
-  onClick,
-  className,
-}: {
+export function Plugin(props: {
   hash: string;
-  hex?: string;
-  className?: string;
-  onClick?: (hash: string) => void;
-  unremovable?: boolean;
+  onClick?: () => void;
 }): ReactElement {
   const [error, showError] = useState('');
   const [config, setConfig] = useState<PluginConfig | null>(null);
-  const [pluginInfo, showPluginInfo] = useState(false);
-  const [remove, showRemove] = useState(false);
 
-  const onRunPlugin = useCallback(async () => {
-    if (!config || remove) return;
-
-    if (onClick) {
-      onClick(hash);
-      return;
-    }
+  const onClick = useCallback(async () => {
+    if (!config) return;
 
     try {
-      await openSidePanel();
+      await runPlugin(props.hash, 'start');
 
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_request,
-        data: {
-          pluginHash: hash,
-        },
+      const [tab] = await browser.tabs.query({
+        active: true,
+        currentWindow: true,
       });
 
-      await runPlugin(hash, 'start');
+      await browser.storage.local.set({ plugin_hash: props.hash });
+
+      // @ts-ignore
+      if (chrome.sidePanel) await chrome.sidePanel.open({ tabId: tab.id });
 
       window.close();
     } catch (e: any) {
       showError(e.message);
     }
-  }, [hash, config, remove, onClick]);
+  }, [props.hash, config]);
 
   useEffect(() => {
     (async function () {
-      if (hex) {
-        setConfig(await getPluginConfig(hexToArrayBuffer(hex)));
-      } else {
-        setConfig(await getPluginConfigByUrl(hash));
-      }
+      setConfig(await fetchPluginConfigByHash(props.hash));
     })();
-  }, [hash, hex]);
+  }, [props.hash]);
 
   const onRemove: MouseEventHandler = useCallback(
     (e) => {
       e.stopPropagation();
-      removePlugin(hash);
-      showRemove(false);
+      removePlugin(props.hash);
     },
-    [hash, remove],
-  );
-
-  const onConfirmRemove: MouseEventHandler = useCallback(
-    (e) => {
-      e.stopPropagation();
-      showRemove(true);
-    },
-    [hash, remove],
-  );
-
-  const onPluginInfo: MouseEventHandler = useCallback(
-    (e) => {
-      e.stopPropagation();
-      showPluginInfo(true);
-    },
-    [hash, pluginInfo],
+    [props.hash],
   );
 
   if (!config) return <></>;
 
   return (
-    <div
+    <button
       className={classNames(
-        'flex flex-row justify-center border rounded border-slate-300 p-2 gap-2 plugin-box',
+        'flex flex-row border rounded border-slate-300 p-2 gap-2 plugin-box',
         'cursor-pointer hover:bg-slate-100 hover:border-slate-400 active:bg-slate-200',
-        className,
       )}
-      onClick={onRunPlugin}
+      onClick={onClick}
     >
       {!!error && <ErrorModal onClose={() => showError('')} message={error} />}
-      {!remove ? (
-        <div className="flex flex-row w-full gap-2">
-          <img className="w-12 h-12" src={config.icon || DefaultPluginIcon} />
-          <div className="flex flex-col w-full items-start">
-            <div className="font-bold flex flex-row h-6 items-center justify-between w-full">
-              {config.title}
-              <div className="flex flex-row items-center justify-center">
-                <Icon
-                  fa="fa-solid fa-circle-info"
-                  className="flex flex-row items-center justify-center cursor-pointer plugin-box__remove-icon"
-                  onClick={onPluginInfo}
-                />
-                {!unremovable && (
-                  <Icon
-                    fa="fa-solid fa-xmark"
-                    className="flex flex-row items-center justify-center cursor-pointer text-red-500 bg-red-200 rounded-full plugin-box__remove-icon"
-                    onClick={onConfirmRemove}
-                  />
-                )}
-              </div>
-            </div>
-            <div>{config.description}</div>
-          </div>
+      <img className="w-12 h-12" src={config.icon || DefaultPluginIcon} />
+      <div className="flex flex-col w-full items-start">
+        <div className="font-bold flex flex-row h-6 items-center justify-between w-full">
+          {config.title}
+          <Icon
+            fa="fa-solid fa-xmark"
+            className="flex flex-row items-center justify-center cursor-pointer text-red-500 bg-red-200 rounded-full plugin-box__remove-icon"
+            onClick={onRemove}
+          />
         </div>
-      ) : (
-        <RemovePlugin
-          onRemove={onRemove}
-          showRemove={showRemove}
-          config={config}
-        />
-      )}
-      {pluginInfo && (
-        <PluginInfoModal
-          pluginContent={config}
-          onClose={() => showPluginInfo(false)}
-        >
-          <PluginInfoModalHeader>
-            <div className="flex flex-row items-end justify-start gap-2">
-              <Icon
-                className="text-slate-500 hover:text-slate-700 cursor-pointer"
-                size={1}
-                fa="fa-solid fa-caret-left"
-                onClick={() => showPluginInfo(false)}
-              />
-            </div>
-          </PluginInfoModalHeader>
-          <PluginInfoModalContent className="flex flex-col items-center cursor-default">
-            <img
-              className="w-12 h-12 mb-2"
-              src={config.icon || DefaultPluginIcon}
-              alt="Plugin Icon"
-            />
-            <span className="text-3xl text-blue-600 font-semibold">
-              {config.title}
-            </span>
-            <div className="text-slate-500 text-lg">{config.description}</div>
-          </PluginInfoModalContent>
-        </PluginInfoModal>
-      )}
-    </div>
-  );
-}
-
-function RemovePlugin(props: {
-  onRemove: MouseEventHandler;
-  showRemove: (show: boolean) => void;
-  config: PluginConfig;
-}): ReactElement {
-  const { onRemove, showRemove, config } = props;
-
-  const onCancel: MouseEventHandler = useCallback((e) => {
-    e.stopPropagation();
-    showRemove(false);
-  }, []);
-
-  return (
-    <div className="flex flex-col items-center w-full gap-1">
-      <div className="font-bold text-red-700">
-        {`Are you sure you want to remove "${config.title}" plugin?`}
-      </div>
-      <div className="mb-1">Warning: this cannot be undone.</div>
-      <div className="flex flex-row w-full gap-1">
-        <button className="flex-grow button p-1" onClick={onCancel}>
-          Cancel
-        </button>
-        <button
-          className="flex-grow font-bold bg-red-500 hover:bg-red-600 text-white rounded p-1"
-          onClick={onRemove}
-        >
-          Remove
-        </button>
-      </div>
-    </div>
+        <div>{config.description}</div>
+      </div>
+    </button>
   );
 }

src/components/RequestBuilder/index.tsx

@@ -1,154 +0,0 @@
-import React, { useCallback } from 'react';
-import c from 'classnames';
-
-export function InputBody(props: {
-  body: string;
-  setBody: (body: string) => void;
-}) {
-  return (
-    <textarea
-      className="textarea h-[90%] w-full resize-none"
-      value={props.body}
-      onChange={(e) => props.setBody(e.target.value)}
-    />
-  );
-}
-
-export function FormBodyTable(props: {
-  formBody: [string, string, boolean?][];
-  setFormBody: (formBody: [string, string, boolean?][]) => void;
-}) {
-  const toggleKV = useCallback(
-    (index: number) => {
-      const newFormBody = [...props.formBody];
-      newFormBody[index][2] = !newFormBody[index][2];
-      props.setFormBody(newFormBody);
-    },
-    [props.formBody],
-  );
-
-  const setKV = useCallback(
-    (index: number, key: string, value: string) => {
-      const newFormBody = [...props.formBody];
-      newFormBody[index] = [key, value];
-      props.setFormBody(newFormBody);
-
-      if (index === props.formBody.length - 1 && (key || value)) {
-        props.setFormBody([...newFormBody, ['', '', true]]);
-      }
-    },
-    [props.formBody],
-  );
-
-  const last = props.formBody.length - 1;
-
-  return (
-    <table className="border border-slate-300 border-collapse table-fixed w-full">
-      <tbody>
-        {props.formBody.map(([key, value, silent], i) => (
-          <tr
-            key={i}
-            className={c('border-b border-slate-200', {
-              'opacity-30': !!silent,
-            })}
-          >
-            <td className="w-8 text-center pt-2">
-              {last !== i && (
-                <input
-                  type="checkbox"
-                  onChange={() => toggleKV(i)}
-                  checked={!silent}
-                />
-              )}
-            </td>
-            <td className="border border-slate-300 font-bold align-top break-all w-fit">
-              <input
-                className="input py-1 px-2 w-full"
-                type="text"
-                value={key}
-                placeholder="Key"
-                onChange={(e) => {
-                  setKV(i, e.target.value, value);
-                }}
-              />
-            </td>
-            <td className="border border-slate-300 break-all align-top">
-              <input
-                className="input py-1 px-2 w-full"
-                type="text"
-                value={value}
-                placeholder="Value"
-                onChange={(e) => {
-                  setKV(i, key, e.target.value);
-                }}
-              />
-            </td>
-          </tr>
-        ))}
-      </tbody>
-    </table>
-  );
-}
-
-export function formatForRequest(
-  input: string | [string, string, boolean?][],
-  type: string,
-): string {
-  try {
-    let pairs: [string, string][] = [];
-
-    if (typeof input === 'string') {
-      const lines = input.split('\n').filter((line) => line.trim() !== '');
-      pairs = lines.map((line) => {
-        const [key, value] = line.split('=').map((part) => part.trim());
-        return [key, value];
-      });
-    } else {
-      pairs = input
-        .filter(([, , silent]) => silent !== true)
-        .map(([key, value]) => [key, value]);
-    }
-    if (type === 'text/plain') {
-      return JSON.stringify(input as string);
-    }
-    if (type === 'application/json') {
-      const jsonObject = JSON.parse(input as string);
-      return JSON.stringify(jsonObject);
-    }
-
-    if (type === 'application/x-www-form-urlencoded') {
-      const searchParams = new URLSearchParams();
-      pairs.forEach(([key, value]) => {
-        searchParams.append(key, value);
-      });
-      return searchParams.toString();
-    }
-
-    return pairs.map(([key, value]) => `${key}=${value}`).join('&');
-  } catch (e) {
-    console.error('Error formatting for request:', e);
-    return '';
-  }
-}
-
-export async function parseResponse(contentType: string, res: Response) {
-  const parsedResponseData = {
-    json: '',
-    text: '',
-    img: '',
-    headers: Array.from(res.headers.entries()),
-  };
-
-  if (contentType?.includes('application/json')) {
-    parsedResponseData.json = await res.json();
-  } else if (contentType?.includes('text')) {
-    parsedResponseData.text = await res.text();
-  } else if (contentType?.includes('image')) {
-    const blob = await res.blob();
-    parsedResponseData.img = URL.createObjectURL(blob);
-  } else {
-    parsedResponseData.text = await res.text();
-  }
-
-  return parsedResponseData;
-}

src/components/RequestDetail/index.tsx

@@ -5,9 +5,8 @@ import React, {
   useEffect,
   useState,
 } from 'react';
-import { notarizeRequest, useRequest } from '../../reducers/requests';
+import { useRequest } from '../../reducers/requests';
 import classNames from 'classnames';
-import { useDispatch } from 'react-redux';
 import {
   Route,
   Routes,
@@ -19,7 +18,6 @@ import Icon from '../Icon';
 import NavigateWithParams from '../NavigateWithParams';
 import {
   set,
-  get,
   MAX_SENT_LS_KEY,
   MAX_RECEIVED_LS_KEY,
   getMaxRecv,

src/components/RequestTable/index.tsx

@@ -1,21 +1,13 @@
-import React, {
-  ReactElement,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from 'react';
+import React, { ReactElement, useCallback, useState } from 'react';
 import { BackgroundActiontype, RequestLog } from '../../entries/Background/rpc';
 import { useNavigate } from 'react-router';
 import Fuse from 'fuse.js';
 import Icon from '../Icon';
 import { useDispatch } from 'react-redux';
 import { setRequests } from '../../reducers/requests';
-import classNames from 'classnames';
 
 type Props = {
   requests: RequestLog[];
-  shouldFix?: boolean;
 };
 
 export default function RequestTable(props: Props): ReactElement {
@@ -55,14 +47,7 @@ export default function RequestTable(props: Props): ReactElement {
 
   return (
     <div className="flex flex-col flex-nowrap flex-grow">
-      <div
-        className={classNames(
-          'flex flex-row flex-nowrap bg-slate-300 py-1 px-2 gap-2',
-          {
-            'fixed top-[4.5rem] w-full shadow': props.shouldFix,
-          },
-        )}
-      >
+      <div className="flex flex-row flex-nowrap bg-slate-300 py-1 px-2 gap-2">
         <input
           className="input w-full"
           type="text"
@@ -76,7 +61,7 @@ export default function RequestTable(props: Props): ReactElement {
           onClick={reset}
         />
       </div>
-      <div className="flex-grow">
+      <div className="flex-grow overflow-y-auto h-0">
         <table className="border border-slate-300 border-collapse table-fixed w-full">
           <thead className="bg-slate-200">
             <tr>

src/components/ResponseDetail/index.tsx

@@ -1,15 +1,63 @@
 import classNames from 'classnames';
-import React, { ReactElement } from 'react';
+import React, { ReactElement, useCallback, useEffect, useState } from 'react';
 
 export default function ResponseDetail(props: {
-  responseData: {
-    json: any | null;
-    text: string | null;
-    img: string | null;
-    headers: [string, string][] | null;
-  } | null;
+  response: Response | null;
   className?: string;
 }): ReactElement {
+  const [json, setJSON] = useState<any | null>(null);
+  const [text, setText] = useState<string | null>(null);
+  const [img, setImg] = useState<string | null>(null);
+  const [formData, setFormData] = useState<URLSearchParams | null>(null);
+
+  useEffect(() => {
+    const resp = props.response;
+
+    if (!resp) return;
+
+    const contentType =
+      resp.headers.get('content-type') || resp.headers.get('Content-Type');
+
+    if (contentType?.includes('application/json')) {
+      resp
+        .json()
+        .then((json) => {
+          if (json) {
+            setJSON(json);
+          }
+        })
+        .catch();
+    } else if (contentType?.includes('text')) {
+      resp
+        .text()
+        .then((_text) => {
+          if (_text) {
+            setText(_text);
+          }
+        })
+        .catch();
+    } else if (contentType?.includes('image')) {
+      resp
+        .blob()
+        .then((blob) => {
+          if (blob) {
+            setImg(URL.createObjectURL(blob));
+          }
+        })
+        .catch();
+    } else {
+      resp
+        .blob()
+        .then((blob) => blob.text())
+        .then((_text) => {
+          if (_text) {
+            setText(_text);
+          }
+        })
+        .catch();
+    }
+  }, [props.response]);
+
   return (
     <div
       className={classNames(
@@ -18,7 +66,7 @@ export default function ResponseDetail(props: {
       )}
     >
       <table className="border border-slate-300 border-collapse table-fixed w-full">
-        {!!props.responseData?.json && (
+        {!!json && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -32,13 +80,13 @@ export default function ResponseDetail(props: {
                 <textarea
                   rows={16}
                   className="w-full bg-slate-100 text-slate-600 p-2 text-xs break-all h-full outline-none font-mono"
-                  value={JSON.stringify(props.responseData.json, null, 2)}
+                  value={JSON.stringify(json, null, 2)}
                 ></textarea>
               </td>
             </tr>
           </>
         )}
-        {!!props.responseData?.text && (
+        {!!text && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -52,13 +100,13 @@ export default function ResponseDetail(props: {
                 <textarea
                   rows={16}
                   className="w-full bg-slate-100 text-slate-600 p-2 text-xs break-all h-full outline-none font-mono"
-                  value={props.responseData.text}
+                  value={text}
                 ></textarea>
               </td>
             </tr>
           </>
         )}
-        {!!props.responseData?.img && (
+        {!!img && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -69,12 +117,12 @@ export default function ResponseDetail(props: {
             </thead>
             <tr>
               <td className="bg-slate-100" colSpan={2}>
-                <img src={props.responseData.img} />
+                <img src={img} />
               </td>
             </tr>
           </>
         )}
-        {!!props.responseData?.headers && (
+        {!!props.response?.headers && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -84,18 +132,20 @@ export default function ResponseDetail(props: {
               </tr>
             </thead>
             <tbody>
-              {props.responseData?.headers.map(([name, value]) => {
-                return (
-                  <tr className="border-b border-slate-200">
-                    <td className="border border-slate-300 font-bold align-top py-1 px-2 whitespace-nowrap">
-                      {name}
-                    </td>
-                    <td className="border border-slate-300 break-all align-top py-1 px-2">
-                      {value}
-                    </td>
-                  </tr>
-                );
-              })}
+              {Array.from(props.response.headers.entries()).map(
+                ([name, value]) => {
+                  return (
+                    <tr className="border-b border-slate-200">
+                      <td className="border border-slate-300 font-bold align-top py-1 px-2 whitespace-nowrap">
+                        {name}
+                      </td>
+                      <td className="border border-slate-300 break-all align-top py-1 px-2">
+                        {value}
+                      </td>
+                    </tr>
+                  );
+                },
+              )}
             </tbody>
           </>
         )}

src/entries/Background/cache.ts

@@ -0,0 +1,76 @@
+import NodeCache from 'node-cache';
+
+let RequestsLogs: {
+  [tabId: string]: NodeCache;
+} = {};
+
+let HeadersStore: {
+  [hostname: string]: NodeCache;
+} = {};
+
+let CookieStore: {
+  [hostname: string]: NodeCache;
+} = {};
+
+export const deleteCacheByTabId = (tabId: number) => {
+  delete RequestsLogs[tabId];
+};
+
+export const getCacheByTabId = (tabId: number): NodeCache => {
+  RequestsLogs[tabId] =
+    RequestsLogs[tabId] ||
+    new NodeCache({
+      stdTTL: 60 * 5, // default 5m TTL
+      maxKeys: 1000000,
+    });
+
+  return RequestsLogs[tabId];
+};
+
+export const deleteHeadersByHost = (hostname: string) => {
+  delete HeadersStore[hostname];
+};
+
+export const getHeaderStoreByHost = (hostname: string): NodeCache => {
+  HeadersStore[hostname] =
+    HeadersStore[hostname] ||
+    new NodeCache({
+      stdTTL: 60 * 5, // default 5m TTL
+      maxKeys: 1000000,
+    });
+
+  return HeadersStore[hostname];
+};
+
+export const deleteCookiesByHost = (hostname: string) => {
+  delete CookieStore[hostname];
+};
+
+export const getCookieStoreByHost = (hostname: string): NodeCache => {
+  CookieStore[hostname] =
+    CookieStore[hostname] ||
+    new NodeCache({
+      stdTTL: 60 * 5, // default 5m TTL
+      maxKeys: 1000000,
+    });
+
+  return CookieStore[hostname];
+};
+
+export const clearRequestCache = () => {
+  RequestsLogs = {};
+};
+
+export const clearHeaderCache = () => {
+  HeadersStore = {};
+};
+
+export const clearCookieCache = () => {
+  CookieStore = {};
+};
+
+export const clearCache = () => {
+  clearRequestCache();
+  clearHeaderCache();
+  clearCookieCache();
+};

src/entries/Background/db.ts

@@ -1,17 +1,9 @@
 import { Level } from 'level';
-import { AbstractSublevel } from 'abstract-level';
-import { PluginConfig, PluginMetadata, sha256, urlify } from '../../utils/misc';
-import {
-  RequestHistory,
-  RequestLog,
-  RequestProgress,
-  UpsertRequestLog,
-} from './rpc';
-import mutex from './mutex';
-import { minimatch } from 'minimatch';
+import type { RequestHistory } from './rpc';
+import { PluginConfig, sha256 } from '../../utils/misc';
 const charwise = require('charwise');
 
-export const db = new Level('./ext-db', {
+const db = new Level('./ext-db', {
   valueEncoding: 'json',
 });
 const historyDb = db.sublevel<string, RequestHistory>('history', {
@@ -23,95 +15,6 @@ const pluginDb = db.sublevel<string, string>('plugin', {
 const pluginConfigDb = db.sublevel<string, PluginConfig>('pluginConfig', {
   valueEncoding: 'json',
 });
-const pluginMetadataDb = db.sublevel<string, PluginMetadata>('pluginMetadata', {
-  valueEncoding: 'json',
-});
-const connectionDb = db.sublevel<string, boolean>('connections', {
-  valueEncoding: 'json',
-});
-const localStorageDb = db.sublevel<string, any>('sessionStorage', {
-  valueEncoding: 'json',
-});
-const sessionStorageDb = db.sublevel<string, any>('localStorage', {
-  valueEncoding: 'json',
-});
-const appDb = db.sublevel<string, any>('app', {
-  valueEncoding: 'json',
-});
-const requestDb = db.sublevel<string, any>('requests', {
-  valueEncoding: 'json',
-});
-
-enum AppDatabaseKey {
-  DefaultPluginsInstalled = 'DefaultPluginsInstalled',
-}
-
-export async function upsertRequestLog(request: UpsertRequestLog) {
-  const existing = await getRequestLog(request.requestId);
-
-  if (existing) {
-    await requestDb.put(request.requestId, {
-      ...existing,
-      ...request,
-    });
-  } else if (request.url) {
-    const host = urlify(request.url)?.host;
-    if (host) {
-      await requestDb.put(request.requestId, request);
-      await requestDb
-        .sublevel(request.tabId.toString())
-        .put(request.requestId, '');
-      await requestDb.sublevel(host).put(request.requestId, '');
-    }
-  }
-}
-
-export async function getRequestLog(
-  requestId: string,
-): Promise<RequestLog | null> {
-  return requestDb.get(requestId).catch(() => null);
-}
-
-export async function removeRequestLog(requestId: string) {
-  const existing = await getRequestLog(requestId);
-  if (existing) {
-    await requestDb.del(requestId);
-    await requestDb.sublevel(existing.tabId.toString()).del(requestId);
-    const host = urlify(existing.url)?.host;
-    if (host) {
-      await requestDb.sublevel(host).del(requestId);
-    }
-  }
-}
-
-export async function removeRequestLogsByTabId(tabId: number) {
-  const requests = requestDb.sublevel(tabId.toString());
-  for await (const [requestId] of requests.iterator()) {
-    await removeRequestLog(requestId);
-  }
-}
-
-export async function getRequestLogsByTabId(tabId: number) {
-  const requests = requestDb.sublevel(tabId.toString());
-  const ret: RequestLog[] = [];
-  for await (const [requestId] of requests.iterator()) {
-    ret.push(await requestDb.get(requestId));
-  }
-  return ret;
-}
-
-export async function getRequestLogsByHost(host: string) {
-  const requests = requestDb.sublevel(host);
-  const ret: RequestLog[] = [];
-  for await (const [requestId] of requests.iterator()) {
-    ret.push(await requestDb.get(requestId));
-  }
-  return ret;
-}
-
-export async function clearAllRequestLogs() {
-  await requestDb.clear();
-}
 
 export async function addNotaryRequest(
   now = Date.now(),
@@ -146,17 +49,6 @@ export async function addNotaryRequestProofs(
   return newReq;
 }
 
-export async function setNotaryRequestSessionId(
-  id: string,
-  sessionId: string,
-): Promise<RequestHistory | null> {
-  const existing = await historyDb.get(id);
-  if (!existing) return null;
-  const newReq: RequestHistory = { ...existing, sessionId };
-  await historyDb.put(id, newReq);
-  return newReq;
-}
-
 export async function setNotaryRequestStatus(
   id: string,
   status: '' | 'pending' | 'success' | 'error',
@@ -194,33 +86,9 @@ export async function setNotaryRequestError(
   return newReq;
 }
 
-export async function setNotaryRequestProgress(
-  id: string,
-  progress: RequestProgress,
-  errorMessage?: string,
-): Promise<RequestHistory | null> {
-  const existing = await historyDb.get(id);
-  if (!existing) return null;
-
-  const newReq: RequestHistory = {
-    ...existing,
-    progress,
-    errorMessage,
-  };
-
-  await historyDb.put(id, newReq);
-
-  return newReq;
-}
-
 export async function setNotaryRequestVerification(
   id: string,
-  verification: {
-    sent: string;
-    recv: string;
-    verifierKey: string;
-    notaryKey?: string;
-  },
+  verification: { sent: string; recv: string },
 ): Promise<RequestHistory | null> {
   const existing = await historyDb.get(id);
 
@@ -259,55 +127,54 @@ export async function getNotaryRequests(): Promise<RequestHistory[]> {
 export async function getNotaryRequest(
   id: string,
 ): Promise<RequestHistory | null> {
-  return historyDb.get(id).catch(() => null);
+  return historyDb.get(id);
 }
 
 export async function getPluginHashes(): Promise<string[]> {
   const retVal: string[] = [];
   for await (const [key] of pluginDb.iterator()) {
+    // pluginDb.del(key);
+    // pluginConfigDb.del(key);
     retVal.push(key);
   }
   return retVal;
 }
 
-export async function getPluginByUrl(url: string): Promise<string | null> {
+export async function getPluginByHash(hash: string): Promise<string | null> {
   try {
-    const plugin = await pluginDb.get(url);
+    const plugin = await pluginDb.get(hash);
     return plugin;
   } catch (e) {
     return null;
   }
 }
 
-export async function addPlugin(
-  hex: string,
-  url: string,
-): Promise<string | null> {
+export async function addPlugin(hex: string): Promise<string | null> {
   const hash = await sha256(hex);
 
-  if (await getPluginByUrl(url)) {
-    return url;
+  if (await getPluginByHash(hash)) {
+    return null;
   }
 
-  await pluginDb.put(url, hex);
+  await pluginDb.put(hash, hex);
   return hash;
 }
 
-export async function removePlugin(url: string): Promise<string | null> {
-  const existing = await pluginDb.get(url);
+export async function removePlugin(hash: string): Promise<string | null> {
+  const existing = await pluginDb.get(hash);
 
   if (!existing) return null;
 
-  await pluginDb.del(url);
+  await pluginDb.del(hash);
 
-  return url;
+  return hash;
 }
 
-export async function getPluginConfigByUrl(
-  url: string,
+export async function getPluginConfigByHash(
+  hash: string,
 ): Promise<PluginConfig | null> {
   try {
-    const config = await pluginConfigDb.get(url);
+    const config = await pluginConfigDb.get(hash);
     return config;
   } catch (e) {
     return null;
@@ -315,84 +182,25 @@ export async function getPluginConfigByUrl(
 }
 
 export async function addPluginConfig(
-  url: string,
+  hash: string,
   config: PluginConfig,
 ): Promise<PluginConfig | null> {
-  if (await getPluginConfigByUrl(url)) {
+  if (await getPluginConfigByHash(hash)) {
     return null;
   }
 
-  await pluginConfigDb.put(url, config);
+  await pluginConfigDb.put(hash, config);
   return config;
 }
 
 export async function removePluginConfig(
-  url: string,
+  hash: string,
 ): Promise<PluginConfig | null> {
-  const existing = await pluginConfigDb.get(url);
+  const existing = await pluginConfigDb.get(hash);
 
   if (!existing) return null;
 
-  await pluginConfigDb.del(url);
-
-  return existing;
-}
-
-export async function getPlugins(): Promise<
-  (PluginConfig & { hash: string; metadata: PluginMetadata })[]
-> {
-  const hashes = await getPluginHashes();
-  const ret: (PluginConfig & { hash: string; metadata: PluginMetadata })[] = [];
-  for (const hash of hashes) {
-    const config = await getPluginConfigByUrl(hash);
-    const metadata = await getPluginMetadataByUrl(hash);
-    if (config) {
-      ret.push({
-        ...config,
-        hash,
-        metadata: metadata
-          ? {
-              ...metadata,
-              hash,
-            }
-          : {
-              filePath: '',
-              origin: '',
-              hash,
-            },
-      });
-    }
-  }
-  return ret;
-}
-
-export async function getPluginMetadataByUrl(
-  url: string,
-): Promise<PluginMetadata | null> {
-  try {
-    const metadata = await pluginMetadataDb.get(url);
-    return metadata;
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function addPluginMetadata(
-  url: string,
-  metadata: PluginMetadata,
-): Promise<PluginMetadata | null> {
-  await pluginMetadataDb.put(url, metadata);
-  return metadata;
-}
-
-export async function removePluginMetadata(
-  url: string,
-): Promise<PluginMetadata | null> {
-  const existing = await pluginMetadataDb.get(url);
-
-  if (!existing) return null;
-
-  await pluginMetadataDb.del(url);
+  await pluginConfigDb.del(hash);
 
   return existing;
 }
@@ -414,231 +222,3 @@ export async function setNotaryRequestCid(
 
   return newReq;
 }
-
-export async function setConnection(origin: string) {
-  if (await getConnection(origin)) return null;
-  await connectionDb.put(origin, true);
-  return true;
-}
-
-export async function getCookiesByHost(linkOrHost: string) {
-  const ret: { [key: string]: string } = {};
-  const url = urlify(linkOrHost);
-  const isHost = !url;
-  const host = isHost ? linkOrHost : url.host;
-  const requests = await getRequestLogsByHost(host);
-
-  let filteredRequest: RequestLog | null = null;
-
-  for (const request of requests) {
-    if (isHost) {
-      if (!filteredRequest || filteredRequest.updatedAt > request.updatedAt) {
-        filteredRequest = request;
-      }
-    } else {
-      const { origin, pathname } = urlify(request.url) || {};
-      const link = [origin, pathname].join('');
-      if (
-        minimatch(link, linkOrHost) &&
-        (!filteredRequest || filteredRequest.updatedAt > request.updatedAt)
-      ) {
-        filteredRequest = request;
-      }
-    }
-  }
-
-  if (!filteredRequest) return ret;
-
-  for (const header of filteredRequest.requestHeaders) {
-    if (header.name.toLowerCase() === 'cookie') {
-      header.value?.split(';').forEach((cookie) => {
-        const [name, value] = cookie.split('=');
-        ret[name.trim()] = value.trim();
-      });
-    }
-  }
-
-  return ret;
-}
-
-export async function deleteConnection(origin: string) {
-  return mutex.runExclusive(async () => {
-    if (await getConnection(origin)) {
-      await connectionDb.del(origin);
-    }
-  });
-}
-
-export async function getConnection(origin: string) {
-  try {
-    const existing = await connectionDb.get(origin);
-    return existing;
-  } catch (e) {
-    return null;
-  }
-}
-export async function getHeadersByHost(linkOrHost: string) {
-  const ret: { [key: string]: string } = {};
-  const url = urlify(linkOrHost);
-  const isHost = !url;
-  const host = isHost ? linkOrHost : url.host;
-  const requests = await getRequestLogsByHost(host);
-
-  let filteredRequest: RequestLog | null = null;
-
-  for (const request of requests) {
-    if (isHost) {
-      if (!filteredRequest || filteredRequest.updatedAt > request.updatedAt) {
-        filteredRequest = request;
-      }
-    } else {
-      const { origin, pathname } = urlify(request.url) || {};
-      const link = [origin, pathname].join('');
-      if (
-        minimatch(link, linkOrHost) &&
-        (!filteredRequest || filteredRequest.updatedAt > request.updatedAt)
-      ) {
-        filteredRequest = request;
-      }
-    }
-  }
-
-  if (!filteredRequest) return ret;
-
-  for (const header of filteredRequest.requestHeaders) {
-    if (header.name.toLowerCase() !== 'cookie') {
-      ret[header.name] = header.value || '';
-    }
-  }
-
-  return ret;
-}
-
-export async function setLocalStorage(
-  host: string,
-  name: string,
-  value: string,
-) {
-  return mutex.runExclusive(async () => {
-    await localStorageDb.sublevel(host).put(name, value);
-    return true;
-  });
-}
-
-export async function setSessionStorage(
-  host: string,
-  name: string,
-  value: string,
-) {
-  return mutex.runExclusive(async () => {
-    await sessionStorageDb.sublevel(host).put(name, value);
-    return true;
-  });
-}
-
-export async function clearLocalStorage(host: string) {
-  return mutex.runExclusive(async () => {
-    await localStorageDb.sublevel(host).clear();
-    return true;
-  });
-}
-
-export async function clearSessionStorage(host: string) {
-  return mutex.runExclusive(async () => {
-    await sessionStorageDb.sublevel(host).clear();
-    return true;
-  });
-}
-
-export async function getLocalStorageByHost(host: string) {
-  const ret: { [key: string]: string } = {};
-  for await (const [key, value] of localStorageDb.sublevel(host).iterator()) {
-    ret[key] = value;
-  }
-  return ret;
-}
-
-export async function getSessionStorageByHost(host: string) {
-  const ret: { [key: string]: string } = {};
-  for await (const [key, value] of sessionStorageDb.sublevel(host).iterator()) {
-    ret[key] = value;
-  }
-  return ret;
-}
-
-async function getDefaultPluginsInstalled(): Promise<string | boolean> {
-  return appDb.get(AppDatabaseKey.DefaultPluginsInstalled).catch(() => false);
-}
-
-export async function setDefaultPluginsInstalled(
-  installed: string | boolean = false,
-) {
-  return mutex.runExclusive(async () => {
-    await appDb.put(AppDatabaseKey.DefaultPluginsInstalled, installed);
-  });
-}
-
-export async function getAppState() {
-  return {
-    defaultPluginsInstalled: await getDefaultPluginsInstalled(),
-  };
-}
-
-export async function resetDB() {
-  return mutex.runExclusive(async () => {
-    return Promise.all([
-      localStorageDb.clear(),
-      sessionStorageDb.clear(),
-      requestDb.clear(),
-    ]);
-  });
-}
-
-export async function getDBSizeByRoot(
-  rootDB: AbstractSublevel<Level, any, any, any>,
-): Promise<number> {
-  return new Promise(async (resolve, reject) => {
-    let size = 0;
-
-    for await (const sublevel of rootDB.keys({ keyEncoding: 'utf8' })) {
-      const link = sublevel.split('!')[1];
-      const sub = rootDB.sublevel(link);
-      for await (const [key, value] of sub.iterator()) {
-        size += key.length + value.length;
-      }
-    }
-
-    resolve(size);
-  });
-}
-
-export async function getRecursiveDBSize(
-  db: AbstractSublevel<Level, any, any, any>,
-): Promise<number> {
-  return new Promise(async (resolve, reject) => {
-    let size = 0;
-    for await (const sublevel of db.keys({ keyEncoding: 'utf8' })) {
-      const parts = sublevel.split('!');
-      if (parts.length === 1) {
-        const value = await db.get(parts[0]);
-        size += parts[0].length + (value ? JSON.stringify(value).length : 0);
-      } else {
-        const sub = db.sublevel(parts[1]);
-        size +=
-          (await getRecursiveDBSize(
-            sub as unknown as AbstractSublevel<Level, any, any, any>,
-          )) + parts[1].length;
-      }
-    }
-    resolve(size);
-  });
-}
-
-export async function getDBSize(): Promise<number> {
-  const sizes = await Promise.all([
-    getDBSizeByRoot(localStorageDb),
-    getDBSizeByRoot(sessionStorageDb),
-    getRecursiveDBSize(requestDb),
-  ]);
-  return sizes.reduce((a, b) => a + b, 0);
-}

src/entries/Background/handlers.ts

@@ -1,9 +1,13 @@
-import { BackgroundActiontype } from './rpc';
+import {
+  getCacheByTabId,
+  getCookieStoreByHost,
+  getHeaderStoreByHost,
+} from './cache';
+import { BackgroundActiontype, RequestLog } from './rpc';
 import mutex from './mutex';
 import browser from 'webextension-polyfill';
 import { addRequest } from '../../reducers/requests';
 import { urlify } from '../../utils/misc';
-import { getRequestLog, upsertRequestLog } from './db';
 
 export const onSendHeaders = (
   details: browser.WebRequest.OnSendHeadersDetailsType,
@@ -12,22 +16,38 @@ export const onSendHeaders = (
     const { method, tabId, requestId } = details;
 
     if (method !== 'OPTIONS') {
-      const { origin, pathname } = urlify(details.url) || {};
+      const cache = getCacheByTabId(tabId);
+      const existing = cache.get<RequestLog>(requestId);
+      const { hostname } = urlify(details.url) || {};
 
-      const link = [origin, pathname].join('');
+      if (hostname && details.requestHeaders) {
+        const headerStore = getHeaderStoreByHost(hostname);
 
-      if (link && details.requestHeaders) {
-        upsertRequestLog({
-          method: details.method as 'GET' | 'POST',
-          type: details.type,
-          url: details.url,
-          initiator: details.initiator || null,
-          requestHeaders: details.requestHeaders || [],
-          tabId: tabId,
-          requestId: requestId,
-          updatedAt: Date.now(),
+        details.requestHeaders.forEach((header) => {
+          const { name, value } = header;
+          if (/^cookie$/i.test(name) && value) {
+            const cookieStore = getCookieStoreByHost(hostname);
+            value
+              .split(';')
+              .map((v) => v.split('='))
+              .forEach((cookie) => {
+                cookieStore.set(cookie[0].trim(), cookie[1]);
+              });
+          } else {
+            headerStore.set(name, value);
+          }
         });
       }
+      cache.set(requestId, {
+        ...existing,
+        method: details.method as 'GET' | 'POST',
+        type: details.type,
+        url: details.url,
+        initiator: details.initiator || null,
+        requestHeaders: details.requestHeaders || [],
+        tabId: tabId,
+        requestId: requestId,
+      });
     }
   });
 };
@@ -39,32 +59,25 @@ export const onBeforeRequest = (
     const { method, requestBody, tabId, requestId } = details;
 
     if (method === 'OPTIONS') return;
-
     if (requestBody) {
+      const cache = getCacheByTabId(tabId);
+      const existing = cache.get<RequestLog>(requestId);
+
       if (requestBody.raw && requestBody.raw[0]?.bytes) {
         try {
-          await upsertRequestLog({
+          cache.set(requestId, {
+            ...existing,
             requestBody: Buffer.from(requestBody.raw[0].bytes).toString(
               'utf-8',
             ),
-            requestId: requestId,
-            tabId: tabId,
-            updatedAt: Date.now(),
           });
         } catch (e) {
           console.error(e);
         }
       } else if (requestBody.formData) {
-        await upsertRequestLog({
-          formData: Object.fromEntries(
-            Object.entries(requestBody.formData).map(([key, value]) => [
-              key,
-              Array.isArray(value) ? value : [value],
-            ]),
-          ),
-          requestId: requestId,
-          tabId: tabId,
-          updatedAt: Date.now(),
+        cache.set(requestId, {
+          ...existing,
+          formData: requestBody.formData,
         });
       }
     }
@@ -79,7 +92,11 @@ export const onResponseStarted = (
 
     if (method === 'OPTIONS') return;
 
-    await upsertRequestLog({
+    const cache = getCacheByTabId(tabId);
+    const existing = cache.get<RequestLog>(requestId);
+    const newLog: RequestLog = {
+      requestHeaders: [],
+      ...existing,
       method: details.method,
       type: details.type,
       url: details.url,
@@ -87,15 +104,9 @@ export const onResponseStarted = (
       tabId: tabId,
       requestId: requestId,
       responseHeaders,
-      updatedAt: Date.now(),
-    });
+    };
 
-    const newLog = await getRequestLog(requestId);
-
-    if (!newLog) {
-      console.error('Request log not found', requestId);
-      return;
-    }
+    cache.set(requestId, newLog);
 
     chrome.runtime.sendMessage({
       type: BackgroundActiontype.push_action,

src/entries/Background/index.ts

@@ -1,12 +1,6 @@
 import { onBeforeRequest, onResponseStarted, onSendHeaders } from './handlers';
+import { deleteCacheByTabId } from './cache';
 import browser from 'webextension-polyfill';
-import {
-  getAppState,
-  removePlugin,
-  removeRequestLogsByTabId,
-  setDefaultPluginsInstalled,
-} from './db';
-import { installPlugin } from './plugins/utils';
 
 (async () => {
   browser.webRequest.onSendHeaders.addListener(
@@ -34,43 +28,9 @@ import { installPlugin } from './plugins/utils';
   );
 
   browser.tabs.onRemoved.addListener((tabId) => {
-    removeRequestLogsByTabId(tabId);
+    deleteCacheByTabId(tabId);
   });
 
-  const { defaultPluginsInstalled } = await getAppState();
-
-  switch (defaultPluginsInstalled) {
-    case false: {
-      try {
-        const twitterProfileUrl = browser.runtime.getURL(
-          'twitter_profile.wasm',
-        );
-        const discordDmUrl = browser.runtime.getURL('discord_dm.wasm');
-        await installPlugin(twitterProfileUrl);
-        await installPlugin(discordDmUrl);
-      } finally {
-        await setDefaultPluginsInstalled('0.1.0.703');
-      }
-      break;
-    }
-    case true: {
-      try {
-        await removePlugin(
-          '6931d2ad63340d3a1fb1a5c1e3f4454c5a518164d6de5ad272e744832355ee02',
-        );
-        const twitterProfileUrl = browser.runtime.getURL(
-          'twitter_profile.wasm',
-        );
-        await installPlugin(twitterProfileUrl);
-      } finally {
-        await setDefaultPluginsInstalled('0.1.0.703');
-      }
-      break;
-    }
-    case '0.1.0.703':
-      break;
-  }
-
   const { initRPC } = await import('./rpc');
   await createOffscreenDocument();
   initRPC();

src/entries/Background/plugins/utils.ts

@@ -1,38 +0,0 @@
-import { addPlugin, addPluginConfig, addPluginMetadata } from '../db';
-import { getPluginConfig } from '../../../utils/misc';
-
-export async function installPlugin(
-  url: string,
-  origin = '',
-  filePath = '',
-  metadata: {[key: string]: string} = {},
-) {
-  const resp = await fetch(url);
-  const arrayBuffer = await resp.arrayBuffer();
-
-  const config = await getPluginConfig(arrayBuffer);
-  const hex = Buffer.from(arrayBuffer).toString('hex');
-  const hash = await addPlugin(hex, url);
-
-  await addPluginConfig(url, config);
-  await addPluginMetadata(url, {
-    ...metadata,
-    origin,
-    filePath,
-  });
-  return hash;
-}
-
-export function mapSecretsToRange(secrets: string[], text: string) {
-  return secrets
-    .map((secret: string) => {
-      const index = text.indexOf(secret);
-      return index > -1
-        ? {
-          start: index,
-          end: index + secret.length,
-        }
-        : null;
-    })
-    .filter((data: any) => !!data) as { start: number; end: number }[]
-}

src/entries/Background/ws.ts

@@ -1,481 +0,0 @@
-import { devlog, safeParseJSON, sha256 } from '../../utils/misc';
-import {
-  appendIncomingPairingRequests,
-  appendIncomingProofRequests,
-  appendOutgoingPairingRequests,
-  appendOutgoingProofRequest,
-  setClientId,
-  setConnected,
-  setIncomingPairingRequest,
-  setIncomingProofRequest,
-  setIsProving,
-  setIsVerifying,
-  setOutgoingPairingRequest,
-  setOutgoingProofRequest,
-  setP2PError,
-  setP2PPresentation,
-  setPairing,
-} from '../../reducers/p2p';
-import { pushToRedux } from '../utils';
-import { getPluginByUrl } from './db';
-import browser from 'webextension-polyfill';
-import { OffscreenActionTypes } from '../Offscreen/types';
-import { getMaxRecv, getMaxSent, getRendezvousApi } from '../../utils/storage';
-import { SidePanelActionTypes } from '../SidePanel/types';
-import { Transcript, VerifierOutput } from 'tlsn-js';
-
-const state: {
-  clientId: string;
-  pairing: string;
-  socket: WebSocket | null;
-  connected: boolean;
-  reqId: number;
-  incomingPairingRequests: string[];
-  outgoingPairingRequests: string[];
-  incomingProofRequests: string[];
-  outgoingProofRequests: string[];
-  isProving: boolean;
-  isVerifying: boolean;
-  presentation: null | { sent: string; recv: string };
-} = {
-  clientId: '',
-  pairing: '',
-  socket: null,
-  connected: false,
-  reqId: 0,
-  incomingPairingRequests: [],
-  outgoingPairingRequests: [],
-  incomingProofRequests: [],
-  outgoingProofRequests: [],
-  isProving: false,
-  isVerifying: false,
-  presentation: null,
-};
-
-export const getP2PState = async () => {
-  pushToRedux(setPairing(state.pairing));
-  pushToRedux(setConnected(state.connected));
-  pushToRedux(setClientId(state.clientId));
-  pushToRedux(setIncomingPairingRequest(state.incomingPairingRequests));
-  pushToRedux(setOutgoingPairingRequest(state.outgoingPairingRequests));
-  pushToRedux(setIncomingProofRequest(state.incomingProofRequests));
-  pushToRedux(setOutgoingProofRequest(state.outgoingProofRequests));
-  pushToRedux(setIsProving(state.isProving));
-  pushToRedux(setIsVerifying(state.isVerifying));
-  pushToRedux(setP2PPresentation(state.presentation));
-};
-
-export const connectSession = async () => {
-  if (state.socket) return;
-
-  const rendezvousAPI = await getRendezvousApi();
-
-  const socket = new WebSocket(rendezvousAPI);
-
-  socket.onopen = () => {
-    devlog('Connected to websocket');
-    state.connected = true;
-    state.socket = socket;
-    pushToRedux(setConnected(true));
-    const heartbeatInterval = setInterval(() => {
-      if (socket.readyState === 1) {
-        // Check if connection is open
-        socket.send(bufferify({ method: 'ping' }));
-      } else {
-        disconnectSession();
-        clearInterval(heartbeatInterval); // Stop heartbeat if connection is closed
-      }
-    }, 55000);
-  };
-
-  socket.onmessage = async (event) => {
-    const message: any = safeParseJSON(await event.data.text());
-
-    if (message.error) {
-      pushToRedux(setP2PError(message.error.message));
-      return;
-    }
-
-    switch (message.method) {
-      case 'client_connect': {
-        const { clientId } = message.params;
-        state.clientId = clientId;
-        pushToRedux(setClientId(clientId));
-        break;
-      }
-      case 'pair_request': {
-        const { from } = message.params;
-        state.incomingPairingRequests = [
-          ...new Set(state.incomingPairingRequests.concat(from)),
-        ];
-        pushToRedux(appendIncomingPairingRequests(from));
-        sendMessage(from, 'pair_request_sent', { pairId: state.clientId });
-        break;
-      }
-      case 'pair_request_sent': {
-        const { pairId } = message.params;
-        state.outgoingPairingRequests = [
-          ...new Set(state.outgoingPairingRequests.concat(pairId)),
-        ];
-        pushToRedux(appendOutgoingPairingRequests(pairId));
-        break;
-      }
-      case 'pair_request_cancel': {
-        const { from } = message.params;
-        state.incomingPairingRequests = state.incomingPairingRequests.filter(
-          (id) => id !== from,
-        );
-        pushToRedux(setIncomingPairingRequest(state.incomingPairingRequests));
-        sendMessage(from, 'pair_request_cancelled', { pairId: state.clientId });
-        break;
-      }
-      case 'pair_request_cancelled': {
-        const { pairId } = message.params;
-        state.outgoingPairingRequests = state.outgoingPairingRequests.filter(
-          (id) => id !== pairId,
-        );
-        pushToRedux(setOutgoingPairingRequest(state.outgoingPairingRequests));
-        break;
-      }
-      case 'pair_request_reject': {
-        const { from } = message.params;
-        state.outgoingPairingRequests = state.outgoingPairingRequests.filter(
-          (id) => id !== from,
-        );
-        pushToRedux(setOutgoingPairingRequest(state.outgoingPairingRequests));
-        sendMessage(from, 'pair_request_rejected', { pairId: state.clientId });
-        break;
-      }
-      case 'pair_request_accept': {
-        const { from } = message.params;
-        state.pairing = from;
-        state.outgoingPairingRequests = state.outgoingPairingRequests.filter(
-          (id) => id !== from,
-        );
-        pushToRedux(setOutgoingPairingRequest(state.outgoingPairingRequests));
-        pushToRedux(setPairing(from));
-        sendMessage(from, 'pair_request_success', { pairId: state.clientId });
-        break;
-      }
-      case 'pair_request_success': {
-        const { pairId } = message.params;
-        state.pairing = pairId;
-        pushToRedux(setPairing(pairId));
-        state.incomingPairingRequests = state.incomingPairingRequests.filter(
-          (id) => id !== pairId,
-        );
-        pushToRedux(setIncomingPairingRequest(state.incomingPairingRequests));
-        break;
-      }
-      case 'pair_request_rejected': {
-        const { pairId } = message.params;
-        state.incomingPairingRequests = state.incomingPairingRequests.filter(
-          (id) => id !== pairId,
-        );
-        pushToRedux(setIncomingPairingRequest(state.incomingPairingRequests));
-        break;
-      }
-      case 'request_proof': {
-        const { plugin, pluginHash, from } = message.params;
-        state.incomingProofRequests = [
-          ...new Set(state.incomingProofRequests.concat(plugin)),
-        ];
-        pushToRedux(appendIncomingProofRequests(plugin));
-        sendMessage(from, 'proof_request_received', { pluginHash });
-        break;
-      }
-      case 'request_proof_by_hash': {
-        const { pluginHash, from } = message.params;
-        const plugin = await getPluginByUrl(pluginHash);
-        if (plugin) {
-          state.incomingProofRequests = [
-            ...new Set(state.incomingProofRequests.concat(plugin)),
-          ];
-          pushToRedux(appendIncomingProofRequests(plugin));
-          sendMessage(from, 'proof_request_received', { pluginHash });
-        } else {
-          sendMessage(from, 'request_proof_by_hash_failed', { pluginHash });
-        }
-        break;
-      }
-      case 'request_proof_by_hash_failed': {
-        const { pluginHash } = message.params;
-        requestProof(pluginHash);
-        break;
-      }
-      case 'proof_request_received': {
-        const { pluginHash } = message.params;
-        state.outgoingProofRequests = [
-          ...new Set(state.outgoingProofRequests.concat(pluginHash)),
-        ];
-        pushToRedux(appendOutgoingProofRequest(pluginHash));
-        break;
-      }
-      case 'proof_request_cancelled':
-        await handleRemoveOutgoingProofRequest(message);
-        break;
-      case 'proof_request_reject': {
-        const { pluginHash, from } = message.params;
-        await handleRemoveOutgoingProofRequest(message);
-        sendMessage(from, 'proof_request_rejected', { pluginHash });
-        break;
-      }
-      case 'proof_request_cancel': {
-        const { pluginHash, from } = message.params;
-        await handleRemoveIncomingProofRequest(message);
-        sendMessage(from, 'proof_request_cancelled', { pluginHash });
-        break;
-      }
-      case 'proof_request_rejected':
-        await handleRemoveIncomingProofRequest(message);
-        break;
-      case 'proof_request_accept': {
-        const { pluginHash, from } = message.params;
-        const maxSentData = await getMaxSent();
-        const maxRecvData = await getMaxRecv();
-        const rendezvousApi = await getRendezvousApi();
-        browser.runtime.sendMessage({
-          type: OffscreenActionTypes.start_p2p_verifier,
-          data: {
-            pluginHash,
-            maxSentData,
-            maxRecvData,
-            verifierUrl:
-              rendezvousApi + '?clientId=' + state.clientId + ':proof',
-            peerId: state.pairing,
-          },
-        });
-        state.isVerifying = true;
-        pushToRedux(setIsVerifying(true));
-        break;
-      }
-      case 'verifier_started': {
-        const { pluginHash } = message.params;
-        browser.runtime.sendMessage({
-          type: SidePanelActionTypes.start_p2p_plugin,
-          data: {
-            pluginHash: pluginHash,
-          },
-        });
-        break;
-      }
-      case 'prover_setup': {
-        const { pluginHash } = message.params;
-        browser.runtime.sendMessage({
-          type: OffscreenActionTypes.prover_setup,
-          data: {
-            pluginHash: pluginHash,
-          },
-        });
-        break;
-      }
-      case 'prover_started': {
-        const { pluginHash } = message.params;
-        browser.runtime.sendMessage({
-          type: OffscreenActionTypes.prover_started,
-          data: {
-            pluginHash: pluginHash,
-          },
-        });
-        break;
-      }
-      case 'proof_request_start': {
-        const { pluginHash, from } = message.params;
-        browser.runtime.sendMessage({
-          type: OffscreenActionTypes.start_p2p_proof_request,
-          data: {
-            pluginHash: pluginHash,
-          },
-        });
-        break;
-      }
-      case 'proof_request_end': {
-        const { pluginHash, proof } = message.params;
-        const transcript = new Transcript({
-          sent: proof.transcript.sent,
-          recv: proof.transcript.recv,
-        });
-
-        state.presentation = {
-          sent: transcript.sent(),
-          recv: transcript.recv(),
-        };
-
-        pushToRedux(setP2PPresentation(state.presentation));
-
-        browser.runtime.sendMessage({
-          type: OffscreenActionTypes.end_p2p_proof_request,
-          data: {
-            pluginHash: pluginHash,
-            proof: proof,
-          },
-        });
-        break;
-      }
-      default:
-        console.warn(`Unknown message type "${message.method}"`);
-        break;
-    }
-  };
-  socket.onerror = (error) => {
-    console.error('Error connecting to websocket:', error);
-    pushToRedux(setConnected(false));
-    pushToRedux(
-      setP2PError(
-        'Failed to connect to rendezvous server. Please check your connection and server URL.',
-      ),
-    );
-  };
-
-  socket.onclose = (event) => {
-    console.log('WebSocket connection closed:', event.code, event.reason);
-    pushToRedux(setConnected(false));
-    if (event.code !== 1000 && event.code !== 1001) {
-      pushToRedux(
-        setP2PError(
-          `WebSocket connection lost: ${event.reason || 'Unknown error'}`,
-        ),
-      );
-    }
-  };
-};
-
-async function handleRemoveOutgoingProofRequest(message: {
-  params: { pluginHash: string };
-}) {
-  const { pluginHash } = message.params;
-  state.outgoingProofRequests = state.outgoingProofRequests.filter(
-    (hash) => hash !== pluginHash,
-  );
-  pushToRedux(setOutgoingProofRequest(state.outgoingProofRequests));
-}
-
-async function handleRemoveIncomingProofRequest(message: {
-  params: { pluginHash: string };
-}) {
-  const { pluginHash } = message.params;
-  const plugin = await getPluginByUrl(pluginHash);
-  const incomingProofRequest = [];
-  for (const hex of state.incomingProofRequests) {
-    if (plugin) {
-      if (plugin !== hex) incomingProofRequest.push(hex);
-    } else {
-      if ((await sha256(hex)) !== pluginHash) incomingProofRequest.push(hex);
-    }
-  }
-
-  state.incomingProofRequests = incomingProofRequest;
-  pushToRedux(setIncomingProofRequest(state.incomingProofRequests));
-}
-
-export const disconnectSession = async () => {
-  if (!state.socket) return;
-  const socket = state.socket;
-  state.socket = null;
-  state.clientId = '';
-  state.pairing = '';
-  state.connected = false;
-  state.incomingPairingRequests = [];
-  state.outgoingPairingRequests = [];
-  state.incomingProofRequests = [];
-  state.outgoingProofRequests = [];
-  state.isProving = false;
-  state.isVerifying = false;
-  state.presentation = null;
-  pushToRedux(setPairing(''));
-  pushToRedux(setConnected(false));
-  pushToRedux(setClientId(''));
-  pushToRedux(setIncomingPairingRequest([]));
-  pushToRedux(setOutgoingPairingRequest([]));
-  pushToRedux(setIncomingProofRequest([]));
-  pushToRedux(setOutgoingProofRequest([]));
-  pushToRedux(setIsProving(false));
-  pushToRedux(setIsVerifying(false));
-  pushToRedux(setP2PPresentation(null));
-  await socket.close();
-};
-
-export async function sendMessage(
-  target: string,
-  method: string,
-  params?: any,
-) {
-  const { socket, clientId } = state;
-
-  if (clientId === target) {
-    console.error('client cannot send message to itself.');
-    return;
-  }
-
-  if (!socket) {
-    console.error('socket connection not found.');
-    return;
-  }
-
-  if (!clientId) {
-    console.error('clientId not found.');
-    return;
-  }
-
-  socket.send(
-    bufferify({
-      method,
-      params: {
-        from: clientId,
-        to: target,
-        id: state.reqId++,
-        ...params,
-      },
-    }),
-  );
-}
-
-export async function sendPairedMessage(method: string, params?: any) {
-  const { pairing } = state;
-
-  if (!pairing) {
-    console.error('not paired to a peer.');
-    return;
-  }
-
-  sendMessage(pairing, method, params);
-}
-
-export const requestProof = async (pluginHash: string) => {
-  const pluginHex = await getPluginByUrl(pluginHash);
-  sendPairedMessage('request_proof', {
-    plugin: pluginHex,
-    pluginHash,
-  });
-};
-
-export const endProofRequest = async (data: {
-  pluginHash: string;
-  proof: VerifierOutput;
-}) => {
-  const transcript = new Transcript({
-    sent: data.proof.transcript?.sent || [],
-    recv: data.proof.transcript?.recv || [],
-  });
-
-  state.presentation = {
-    sent: transcript.sent(),
-    recv: transcript.recv(),
-  };
-
-  pushToRedux(setP2PPresentation(state.presentation));
-
-  sendPairedMessage('proof_request_end', {
-    pluginHash: data.pluginHash,
-    proof: data.proof,
-  });
-};
-
-export const onProverInstantiated = async () => {
-  state.isProving = true;
-  pushToRedux(setIsProving(true));
-};
-
-function bufferify(data: any): Buffer {
-  return Buffer.from(JSON.stringify(data));
-}

src/entries/Content/content.ts

@@ -1,58 +0,0 @@
-import { ContentScriptTypes, RPCClient } from './rpc';
-import { PresentationJSON } from 'tlsn-js/build/types';
-
-const client = new RPCClient();
-
-class TLSN {
-  async notarize(
-    url: string,
-    requestOptions?: {
-      method?: string;
-      headers?: { [key: string]: string };
-      body?: string;
-    },
-    proofOptions?: {
-      notaryUrl?: string;
-      websocketProxyUrl?: string;
-      maxSentData?: number;
-      maxRecvData?: number;
-      metadata?: {
-        [k: string]: string;
-      };
-    },
-  ): Promise<PresentationJSON> {
-    const resp = await client.call(ContentScriptTypes.notarize, {
-      url,
-      method: requestOptions?.method,
-      headers: requestOptions?.headers,
-      body: requestOptions?.body,
-      maxSentData: proofOptions?.maxSentData,
-      maxRecvData: proofOptions?.maxRecvData,
-      notaryUrl: proofOptions?.notaryUrl,
-      websocketProxyUrl: proofOptions?.websocketProxyUrl,
-      metadata: proofOptions?.metadata,
-    });
-
-    return resp;
-  }
-
-  async runPlugin(url: string, params?: Record<string, string>) {
-    const resp = await client.call(ContentScriptTypes.run_plugin_by_url, {
-      url,
-      params,
-    });
-
-    return resp;
-  }
-}
-
-const connect = async () => {
-  return new TLSN();
-};
-
-// @ts-ignore
-window.tlsn = {
-  connect,
-};
-
-window.dispatchEvent(new CustomEvent('tlsn_loaded'));

src/entries/Content/index.ts

@@ -1,119 +1,9 @@
-import browser, { browserAction } from 'webextension-polyfill';
-import { ContentScriptRequest, ContentScriptTypes, RPCServer } from './rpc';
-import { BackgroundActiontype, RequestHistory } from '../Background/rpc';
-import { urlify } from '../../utils/misc';
+window.onerror = (error) => {
+  // console.log('error');
+  // console.log(error);
+};
 
 (async () => {
-  loadScript('content.bundle.js');
-  const server = new RPCServer();
-
-  chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-    if (message.type === BackgroundActiontype.get_local_storage) {
-      chrome.runtime.sendMessage({
-        type: BackgroundActiontype.set_local_storage,
-        data: { ...localStorage },
-      });
-    }
-  });
-
-  chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-    if (message.type === BackgroundActiontype.get_session_storage) {
-      chrome.runtime.sendMessage({
-        type: BackgroundActiontype.set_session_storage,
-        data: { ...sessionStorage },
-      });
-    }
-  });
-
-  server.on(
-    ContentScriptTypes.notarize,
-    async (
-      request: ContentScriptRequest<{
-        url: string;
-        method?: string;
-        headers?: { [key: string]: string };
-        metadata?: { [key: string]: string };
-        body?: string;
-        notaryUrl?: string;
-        websocketProxyUrl?: string;
-        maxSentData?: number;
-        maxRecvData?: number;
-      }>,
-    ) => {
-      const {
-        url,
-        method,
-        headers,
-        body,
-        maxSentData,
-        maxRecvData,
-        notaryUrl,
-        websocketProxyUrl,
-        metadata,
-      } = request.params || {};
-
-      if (!url || !urlify(url)) throw new Error('invalid url.');
-
-      const proof = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.notarize_request,
-        data: {
-          ...getPopupData(),
-          url,
-          method,
-          headers,
-          body,
-          maxSentData,
-          maxRecvData,
-          notaryUrl,
-          websocketProxyUrl,
-          metadata,
-        },
-      });
-
-      return proof;
-    },
-  );
-
-  server.on(
-    ContentScriptTypes.run_plugin_by_url,
-    async (
-      request: ContentScriptRequest<{
-        url: string;
-        params?: Record<string, string>;
-      }>,
-    ) => {
-      const { url, params } = request.params || {};
-
-      if (!url) throw new Error('params must include url');
-
-      const response = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.run_plugin_by_url_request,
-        data: {
-          ...getPopupData(),
-          url,
-          params,
-        },
-      });
-
-      return response;
-    },
-  );
+  console.log('Content script works!');
+  console.log('Must reload extension for modifications to take effect.');
 })();
-
-function loadScript(filename: string) {
-  const url = browser.runtime.getURL(filename);
-  const script = document.createElement('script');
-  script.setAttribute('type', 'text/javascript');
-  script.setAttribute('src', url);
-  document.body.appendChild(script);
-}
-
-function getPopupData() {
-  return {
-    origin: window.origin,
-    position: {
-      left: window.screen.width / 2 - 240,
-      top: window.screen.height / 2 - 300,
-    },
-  };
-}

src/entries/Content/rpc.ts

@@ -1,113 +0,0 @@
-import { deferredPromise, PromiseResolvers } from '../../utils/promise';
-
-export enum ContentScriptTypes {
-  notarize = 'tlsn/cs/notarize',
-  run_plugin_by_url = 'tlsn/cs/run_plugin_by_url',
-}
-
-export type ContentScriptRequest<params> = {
-  tlsnrpc: string;
-} & RPCRequest<ContentScriptTypes, params>;
-
-export type ContentScriptResponse = {
-  tlsnrpc: string;
-} & RPCResponse;
-
-export type RPCRequest<method, params> = {
-  id: number;
-  method: method;
-  params?: params;
-};
-
-export type RPCResponse = {
-  id: number;
-  result?: never;
-  error?: never;
-};
-
-export class RPCServer {
-  #handlers: Map<
-    ContentScriptTypes,
-    (message: ContentScriptRequest<any>) => Promise<any>
-  > = new Map();
-
-  constructor() {
-    window.addEventListener(
-      'message',
-      async (event: MessageEvent<ContentScriptRequest<never>>) => {
-        const data = event.data;
-
-        if (data.tlsnrpc !== '1.0') return;
-        if (!data.method) return;
-
-        const handler = this.#handlers.get(data.method);
-
-        if (handler) {
-          try {
-            const result = await handler(data);
-            window.postMessage({
-              tlsnrpc: '1.0',
-              id: data.id,
-              result,
-            });
-          } catch (error) {
-            window.postMessage({
-              tlsnrpc: '1.0',
-              id: data.id,
-              error,
-            });
-          }
-        } else {
-          throw new Error(`unknown method - ${data.method}`);
-        }
-      },
-    );
-  }
-
-  on(
-    method: ContentScriptTypes,
-    handler: (message: ContentScriptRequest<any>) => Promise<any>,
-  ) {
-    this.#handlers.set(method, handler);
-  }
-}
-
-export class RPCClient {
-  #requests: Map<number, PromiseResolvers> = new Map();
-  #id = 0;
-
-  get id() {
-    return this.#id++;
-  }
-
-  constructor() {
-    window.addEventListener(
-      'message',
-      (event: MessageEvent<ContentScriptResponse>) => {
-        const data = event.data;
-
-        if (data.tlsnrpc !== '1.0') return;
-
-        const promise = this.#requests.get(data.id);
-
-        if (promise) {
-          if (typeof data.result !== 'undefined') {
-            promise.resolve(data.result);
-            this.#requests.delete(data.id);
-          } else if (typeof data.error !== 'undefined') {
-            promise.reject(data.error);
-            this.#requests.delete(data.id);
-          }
-        }
-      },
-    );
-  }
-
-  async call(method: ContentScriptTypes, params?: any): Promise<never> {
-    const request = { tlsnrpc: '1.0', id: this.id, method, params };
-    const defer = deferredPromise();
-    this.#requests.set(request.id, defer);
-    window.postMessage(request, '*');
-    return defer.promise;
-  }
-}

src/entries/Offscreen/Offscreen.tsx

@@ -1,63 +1,103 @@
 import React, { useEffect } from 'react';
-import { OffscreenActionTypes } from './types';
-
 import { BackgroundActiontype } from '../Background/rpc';
-import {
-  initThreads,
-  onCreatePresentationRequest,
-  onCreateProverRequest,
-  onNotarizationRequest,
-  onProcessProveRequest,
-  onVerifyProof,
-  onVerifyProofRequest,
-  startP2PProver,
-  startP2PVerifier,
-} from './rpc';
+import { prove, set_logging_filter, verify } from 'tlsn-js';
+import { urlify } from '../../utils/misc';
+import browser from 'webextension-polyfill';
+import { getLoggingFilter } from '../../utils/storage';
+import { LOGGING_LEVEL_INFO } from '../../utils/constants';
 
 const Offscreen = () => {
   useEffect(() => {
-    (async () => {
-      await initThreads();
-      // @ts-ignore
-      chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
-        switch (request.type) {
-          case OffscreenActionTypes.notarization_request: {
-            onNotarizationRequest(request);
-            break;
-          }
-          case OffscreenActionTypes.create_prover_request: {
-            onCreateProverRequest(request);
-            break;
-          }
-          case OffscreenActionTypes.create_presentation_request: {
-            onCreatePresentationRequest(request);
-            break;
-          }
-          case BackgroundActiontype.process_prove_request: {
-            onProcessProveRequest(request);
-            break;
-          }
-          case BackgroundActiontype.verify_proof: {
-            onVerifyProof(request, sendResponse);
-            return true;
-          }
-          case BackgroundActiontype.verify_prove_request: {
-            onVerifyProofRequest(request);
-            break;
-          }
-          case OffscreenActionTypes.start_p2p_verifier: {
-            startP2PVerifier(request);
-            break;
-          }
-          case OffscreenActionTypes.start_p2p_prover: {
-            startP2PProver(request);
-            break;
-          }
-          default:
-            break;
+    // @ts-ignore
+    chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+      switch (request.type) {
+        case BackgroundActiontype.process_prove_request: {
+          const {
+            url,
+            method,
+            headers,
+            body = '',
+            maxSentData,
+            maxRecvData,
+            maxTranscriptSize,
+            notaryUrl,
+            websocketProxyUrl,
+            id,
+            secretHeaders,
+            secretResps,
+            loggingFilter = LOGGING_LEVEL_INFO,
+          } = request.data;
+
+          (async () => {
+            try {
+              const token = urlify(url)?.hostname || '';
+              await set_logging_filter(loggingFilter);
+              const proof = await prove(url, {
+                method,
+                headers,
+                body,
+                maxSentData,
+                maxRecvData,
+                maxTranscriptSize,
+                notaryUrl,
+                websocketProxyUrl: websocketProxyUrl + `?token=${token}`,
+                secretHeaders,
+                secretResps,
+              });
+
+              browser.runtime.sendMessage({
+                type: BackgroundActiontype.finish_prove_request,
+                data: {
+                  id,
+                  proof,
+                },
+              });
+            } catch (error) {
+              console.log('i caught an error');
+              console.error(error);
+              browser.runtime.sendMessage({
+                type: BackgroundActiontype.finish_prove_request,
+                data: {
+                  id,
+                  error,
+                },
+              });
+            }
+          })();
+
+          break;
         }
-      });
-    })();
+        case BackgroundActiontype.verify_proof: {
+          (async () => {
+            const result = await verify(request.data);
+            sendResponse(result);
+          })();
+
+          return true;
+        }
+        case BackgroundActiontype.verify_prove_request: {
+          (async () => {
+            const result = await verify(request.data.proof);
+
+            if (result) {
+              chrome.runtime.sendMessage<any, string>({
+                type: BackgroundActiontype.finish_prove_request,
+                data: {
+                  id: request.data.id,
+                  verification: {
+                    sent: result.sent,
+                    recv: result.recv,
+                  },
+                },
+              });
+            }
+          })();
+          break;
+        }
+        default:
+          break;
+      }
+    });
   }, []);
 
   return <div className="App" />;

src/entries/Offscreen/rpc.ts

@@ -1,699 +0,0 @@
-import browser from 'webextension-polyfill';
-import {
-  BackgroundActiontype,
-  progressText,
-  RequestProgress,
-} from '../Background/rpc';
-import {
-  mapStringToRange,
-  NotaryServer,
-  Method,
-  Presentation as TPresentation,
-  Prover as TProver,
-  subtractRanges,
-  Transcript,
-  Verifier as TVerifier,
-} from 'tlsn-js';
-import { convertNotaryWsToHttp, devlog, urlify } from '../../utils/misc';
-import * as Comlink from 'comlink';
-import { OffscreenActionTypes } from './types';
-import { PresentationJSON } from 'tlsn-js/build/types';
-import { waitForEvent } from '../utils';
-import {
-  setNotaryRequestError,
-  setNotaryRequestStatus,
-} from '../Background/db';
-
-const { init, Prover, Presentation, Verifier }: any = Comlink.wrap(
-  new Worker(new URL('./worker.ts', import.meta.url)),
-);
-
-const provers: { [id: string]: TProver } = {};
-
-export const initThreads = async () => {
-  const loggingLevel = await browser.runtime.sendMessage({
-    type: BackgroundActiontype.get_logging_level,
-    hardwareConcurrency: navigator.hardwareConcurrency,
-  });
-  await init({
-    loggingLevel,
-    hardwareConcurrency: navigator.hardwareConcurrency,
-  });
-};
-export const onNotarizationRequest = async (request: any) => {
-  const { id } = request.data;
-
-  try {
-    const proof = await createProof(request.data);
-
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.finish_prove_request,
-      data: {
-        id,
-        proof,
-      },
-    });
-
-    browser.runtime.sendMessage({
-      type: OffscreenActionTypes.notarization_response,
-      data: {
-        id,
-        proof,
-      },
-    });
-  } catch (error: any) {
-    console.error(error);
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.finish_prove_request,
-      data: {
-        id,
-        error: error?.message || 'Unknown error',
-      },
-    });
-
-    browser.runtime.sendMessage({
-      type: OffscreenActionTypes.notarization_response,
-      data: {
-        id,
-        error: error?.message || 'Unknown error',
-      },
-    });
-  }
-};
-
-export const onCreateProverRequest = async (request: any) => {
-  const { id } = request.data;
-
-  try {
-    const prover = await createProver(request.data);
-
-    provers[id] = prover;
-
-    updateRequestProgress(id, RequestProgress.ReadingTranscript);
-    browser.runtime.sendMessage({
-      type: OffscreenActionTypes.create_prover_response,
-      data: {
-        id,
-        transcript: await prover.transcript(),
-      },
-    });
-  } catch (error: any) {
-    console.error(error);
-    browser.runtime.sendMessage({
-      type: OffscreenActionTypes.create_prover_response,
-      data: {
-        id,
-        error: error?.message || 'Unknown error',
-      },
-    });
-  }
-};
-
-export const onCreatePresentationRequest = async (request: any) => {
-  const { id, commit, notaryUrl, websocketProxyUrl } = request.data;
-  const prover = provers[id];
-
-  try {
-    if (!prover) throw new Error(`Cannot find prover ${id}.`);
-
-    updateRequestProgress(id, RequestProgress.FinalizingOutputs);
-    const notarizationOutputs = await prover.notarize(commit);
-
-    const presentation = (await new Presentation({
-      attestationHex: notarizationOutputs.attestation,
-      secretsHex: notarizationOutputs.secrets,
-      notaryUrl: notarizationOutputs.notaryUrl,
-      websocketProxyUrl: notarizationOutputs.websocketProxyUrl,
-      reveal: { ...commit, server_identity: false },
-    })) as TPresentation;
-    const json = await presentation.json();
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.finish_prove_request,
-      data: {
-        id,
-        proof: {
-          ...json,
-        },
-      },
-    });
-
-    delete provers[id];
-  } catch (error: any) {
-    console.error(error);
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.finish_prove_request,
-      data: {
-        id,
-        error: error?.message || 'Unknown error',
-      },
-    });
-  }
-};
-
-export const onProcessProveRequest = async (request: any) => {
-  const { id } = request.data;
-
-  try {
-    const proof = await createProof(request.data);
-
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.finish_prove_request,
-      data: {
-        id,
-        proof: proof,
-      },
-    });
-  } catch (error: any) {
-    console.error(error);
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.finish_prove_request,
-      data: {
-        id,
-        error: error?.message || 'Unknown error',
-      },
-    });
-  }
-};
-
-export const onVerifyProof = async (request: any, sendResponse: any) => {
-  const result = await verifyProof(request.data);
-  sendResponse(result);
-};
-
-export const onVerifyProofRequest = async (request: any) => {
-  const proof: PresentationJSON = request.data.proof;
-  const result: {
-    sent: string;
-    recv: string;
-    verifierKey?: string;
-    notaryKey?: string;
-  } = await verifyProof(proof);
-
-  chrome.runtime.sendMessage<any, string>({
-    type: BackgroundActiontype.finish_prove_request,
-    data: {
-      id: request.data.id,
-      verification: {
-        sent: result.sent,
-        recv: result.recv,
-        verifierKey: result.verifierKey,
-        notaryKey: result.notaryKey,
-      },
-    },
-  });
-};
-
-export const startP2PVerifier = async (request: any) => {
-  const { pluginHash, maxSentData, maxRecvData, verifierUrl } = request.data;
-  const verifier: TVerifier = await new Verifier({
-    id: pluginHash,
-    maxSentData: maxSentData,
-    maxRecvData: maxRecvData,
-  });
-
-  await verifier.connect(verifierUrl);
-  const proverStarted = waitForEvent(OffscreenActionTypes.prover_started);
-
-  browser.runtime.sendMessage({
-    type: BackgroundActiontype.verifier_started,
-    data: {
-      pluginHash,
-    },
-  });
-
-  await waitForEvent(OffscreenActionTypes.prover_setup);
-
-  verifier.verify().then((res) => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.proof_request_end,
-      data: {
-        pluginHash,
-        proof: res,
-      },
-    });
-  });
-
-  await proverStarted;
-
-  browser.runtime.sendMessage({
-    type: BackgroundActiontype.start_proof_request,
-    data: {
-      pluginHash,
-    },
-  });
-};
-
-export const startP2PProver = async (request: any) => {
-  const {
-    id,
-    pluginUrl,
-    pluginHex,
-    url,
-    method,
-    headers,
-    body,
-    proverUrl,
-    websocketProxyUrl,
-    maxRecvData,
-    maxSentData,
-    secretHeaders,
-    getSecretResponse,
-    verifierPlugin,
-  } = request.data;
-
-  const hostname = urlify(url)?.hostname || '';
-
-  updateRequestProgress(id, RequestProgress.CreatingProver);
-  const prover: TProver = await new Prover({
-    id,
-    serverDns: hostname,
-    maxSentData,
-    maxRecvData,
-    serverIdentity: true,
-  });
-
-  updateRequestProgress(id, RequestProgress.GettingSession);
-  const resp = await fetch(`${proverUrl}/session`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      clientType: 'Websocket',
-      maxRecvData,
-      maxSentData,
-      plugin: 'plugin-js',
-    }),
-  });
-  const { sessionId } = await resp.json();
-  const _url = new URL(proverUrl);
-  const protocol = _url.protocol === 'https:' ? 'wss' : 'ws';
-  const pathname = _url.pathname;
-  const sessionUrl = `${protocol}://${_url.host}${pathname === '/' ? '' : pathname}/notarize?sessionId=${sessionId!}`;
-
-  updateRequestProgress(id, RequestProgress.SettingUpProver);
-  await prover.setup(sessionUrl);
-
-  await handleProgress(
-    id,
-    RequestProgress.SendingRequest,
-    () =>
-      prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
-        url,
-        method,
-        headers,
-        body,
-      }),
-    `Error connecting to websocket proxy: ${websocketProxyUrl}. Please check the proxy URL and ensure it's accessible.`,
-  );
-
-  updateRequestProgress(id, RequestProgress.ReadingTranscript);
-  const transcript = await prover.transcript();
-
-  let secretResps: string[] = [];
-
-  if (getSecretResponse) {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_secrets_from_transcript,
-      data: {
-        pluginUrl,
-        pluginHex,
-        method: getSecretResponse,
-        transcript,
-        p2p: true,
-      },
-    });
-
-    const msg: any = await waitForEvent(
-      OffscreenActionTypes.get_secrets_from_transcript_success,
-    );
-
-    secretResps = msg.data.secretResps;
-  }
-
-  const commit = {
-    sent: subtractRanges(
-      { start: 0, end: transcript.sent.length },
-      mapStringToRange(
-        secretHeaders,
-        Buffer.from(transcript.sent).toString('utf-8'),
-      ),
-    ),
-    recv: subtractRanges(
-      { start: 0, end: transcript.recv.length },
-      mapStringToRange(
-        secretResps,
-        Buffer.from(transcript.recv).toString('utf-8'),
-      ),
-    ),
-  };
-
-  await prover.reveal({ ...commit, server_identity: true });
-  updateRequestProgress(id, RequestProgress.FinalizingOutputs);
-  browser.runtime.sendMessage({
-    type: BackgroundActiontype.finish_prove_request,
-    data: {
-      id,
-      sessionId: sessionId,
-    },
-  });
-};
-
-async function createProof(options: {
-  url: string;
-  notaryUrl: string;
-  websocketProxyUrl: string;
-  method?: Method;
-  headers?: {
-    [name: string]: string;
-  };
-  body?: any;
-  maxSentData?: number;
-  maxRecvData?: number;
-  id: string;
-  secretHeaders: string[];
-  secretResps: string[];
-}): Promise<PresentationJSON> {
-  const {
-    url,
-    method = 'GET',
-    headers = {},
-    body,
-    maxSentData,
-    maxRecvData,
-    notaryUrl,
-    websocketProxyUrl,
-    id,
-    secretHeaders = [],
-    secretResps = [],
-  } = options;
-
-  const hostname = urlify(url)?.hostname || '';
-  const notary = NotaryServer.from(notaryUrl);
-
-  updateRequestProgress(id, RequestProgress.CreatingProver);
-  const prover: TProver = await new Prover({
-    id,
-    serverDns: hostname,
-    maxSentData,
-    maxRecvData,
-  });
-
-  updateRequestProgress(id, RequestProgress.GettingSession);
-  const sessionUrl = await notary.sessionUrl(maxSentData, maxRecvData);
-
-  updateRequestProgress(id, RequestProgress.SettingUpProver);
-  await prover.setup(sessionUrl);
-
-  await handleProgress(
-    id,
-    RequestProgress.SendingRequest,
-    () =>
-      prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
-        url,
-        method,
-        headers,
-        body,
-      }),
-    `Error connecting to websocket proxy: ${websocketProxyUrl}. Please check the proxy URL and ensure it's accessible.`,
-  );
-
-  updateRequestProgress(id, RequestProgress.ReadingTranscript);
-  const transcript = await prover.transcript();
-
-  const commit = {
-    sent: subtractRanges(
-      { start: 0, end: transcript.sent.length },
-      mapStringToRange(
-        secretHeaders,
-        Buffer.from(transcript.sent).toString('utf-8'),
-      ),
-    ),
-    recv: subtractRanges(
-      { start: 0, end: transcript.recv.length },
-      mapStringToRange(
-        secretResps,
-        Buffer.from(transcript.recv).toString('utf-8'),
-      ),
-    ),
-  };
-
-  updateRequestProgress(id, RequestProgress.FinalizingOutputs);
-  const notarizationOutputs = await prover.notarize(commit);
-
-  const presentation = (await new Presentation({
-    attestationHex: notarizationOutputs.attestation,
-    secretsHex: notarizationOutputs.secrets,
-    notaryUrl: notarizationOutputs.notaryUrl,
-    websocketProxyUrl: notarizationOutputs.websocketProxyUrl,
-    reveal: { ...commit, server_identity: false },
-  })) as TPresentation;
-
-  const json = await presentation.json();
-  return {
-    ...json,
-  };
-}
-
-async function createProver(options: {
-  url: string;
-  notaryUrl: string;
-  websocketProxyUrl: string;
-  method?: Method;
-  headers?: {
-    [name: string]: string;
-  };
-  body?: any;
-  maxSentData?: number;
-  maxRecvData?: number;
-  id: string;
-}): Promise<TProver> {
-  const {
-    url,
-    method = 'GET',
-    headers = {},
-    body,
-    maxSentData,
-    maxRecvData,
-    notaryUrl,
-    websocketProxyUrl,
-    id,
-  } = options;
-
-  const hostname = urlify(url)?.hostname || '';
-  const notary = NotaryServer.from(notaryUrl);
-  try {
-    const prover: TProver = await handleProgress(
-      id,
-      RequestProgress.CreatingProver,
-      () =>
-        new Prover({
-          id,
-          serverDns: hostname,
-          maxSentData,
-          maxRecvData,
-        }),
-      'Error creating prover',
-    );
-
-    const sessionUrl = await handleProgress(
-      id,
-      RequestProgress.GettingSession,
-      () => notary.sessionUrl(maxSentData, maxRecvData),
-      'Error getting session from Notary',
-    );
-
-    await handleProgress(
-      id,
-      RequestProgress.SettingUpProver,
-      () => prover.setup(sessionUrl),
-      'Error setting up prover',
-    );
-
-    await handleProgress(
-      id,
-      RequestProgress.SendingRequest,
-      () =>
-        prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
-          url,
-          method,
-          headers,
-          body,
-        }),
-      `Error connecting to websocket proxy: ${websocketProxyUrl}. Please check the proxy URL and ensure it's accessible.`,
-    );
-
-    return prover;
-  } catch (error) {
-    throw error;
-  }
-}
-
-async function verifyProof(proof: PresentationJSON): Promise<{
-  sent: string;
-  recv: string;
-  verifierKey?: string;
-  notaryKey?: string;
-}> {
-  let result: {
-    sent: string;
-    recv: string;
-    verifierKey?: string;
-    notaryKey?: string;
-  };
-
-  switch (proof.version) {
-    case '0.1.0-alpha.12':
-      result = await verify(proof);
-      break;
-    default:
-      result = {
-        sent: 'version not supported',
-        recv: 'version not supported',
-      };
-      break;
-  }
-
-  return result!;
-}
-
-async function verify(proof: PresentationJSON) {
-  if (proof.version !== '0.1.0-alpha.12') {
-    throw new Error('wrong version');
-  }
-  const presentation: TPresentation = await new Presentation(proof.data);
-  const verifierOutput = await presentation.verify();
-  const transcript = new Transcript({
-    sent: verifierOutput.transcript?.sent || [],
-    recv: verifierOutput.transcript?.recv || [],
-  });
-  const vk = await presentation.verifyingKey();
-  const verifyingKey = Buffer.from(vk.data).toString('hex');
-  const notaryUrl = proof.meta.notaryUrl
-    ? convertNotaryWsToHttp(proof.meta.notaryUrl)
-    : '';
-  const publicKey = await new NotaryServer(notaryUrl)
-    .publicKey()
-    .catch(() => '');
-  return {
-    sent: transcript.sent(),
-    recv: transcript.recv(),
-    verifierKey: verifyingKey,
-    notaryKey: publicKey,
-  };
-}
-
-function updateRequestProgress(
-  id: string,
-  progress: RequestProgress,
-  errorMessage?: string,
-) {
-  const progressMessage =
-    progress === RequestProgress.Error
-      ? `${errorMessage || 'Notarization Failed'}`
-      : progressText(progress);
-  devlog(`Request ${id}: ${progressMessage}`);
-
-  browser.runtime.sendMessage({
-    type: BackgroundActiontype.update_request_progress,
-    data: {
-      id,
-      progress,
-      errorMessage,
-    },
-  });
-}
-
-function getWebsocketErrorMessage(
-  lowerError: string,
-  fallbackMessage: string,
-): string {
-  const isWebsocketError =
-    lowerError.includes('websocket') ||
-    lowerError.includes('proxy') ||
-    lowerError.includes('connection') ||
-    lowerError.includes('network') ||
-    lowerError.includes('prover error') ||
-    lowerError.includes('io error') ||
-    lowerError.includes('certificate') ||
-    lowerError.includes('cert') ||
-    lowerError.includes('ssl') ||
-    lowerError.includes('tls');
-
-  if (!isWebsocketError) {
-    return fallbackMessage;
-  }
-
-  const errorPatterns = [
-    {
-      patterns: ['protocol', 'must use ws://', 'must use wss://'],
-      message:
-        'Invalid websocket proxy URL protocol. Please use ws:// or wss:// protocol in your websocket proxy URL settings.',
-    },
-    {
-      patterns: [
-        'not allowed',
-        'not whitelisted',
-        'forbidden',
-        'unauthorized',
-        'permission denied',
-        'access denied',
-      ],
-      message:
-        'Target domain not allowed by websocket proxy. Please check if the website domain is supported by your proxy service.',
-    },
-    {
-      patterns: ['dns', 'resolve'],
-      message:
-        'Cannot resolve websocket proxy domain. Please check your websocket proxy URL in settings.',
-    },
-    {
-      patterns: ['timeout'],
-      message:
-        'Websocket proxy connection timeout. Please check your websocket proxy URL in settings and ensure the server is accessible.',
-    },
-    {
-      patterns: ['refused', 'unreachable'],
-      message:
-        'Cannot reach websocket proxy server. Please check your websocket proxy URL in settings and ensure the server is accessible.',
-    },
-    {
-      patterns: ['cert', 'certificate', 'certnotvalidforname'],
-      message:
-        'Cannot connect to websocket proxy server. Please check your websocket proxy URL in settings and ensure it points to a valid websocket proxy service.',
-    },
-  ];
-
-  for (const { patterns, message } of errorPatterns) {
-    if (patterns.some((pattern) => lowerError.includes(pattern))) {
-      return message;
-    }
-  }
-
-  return 'Websocket proxy connection failed. Please check your websocket proxy URL in settings and ensure the server is accessible.';
-}
-
-async function handleProgress<T>(
-  id: string,
-  progress: RequestProgress,
-  action: () => Promise<T>,
-  errorMessage: string,
-): Promise<T> {
-  try {
-    updateRequestProgress(id, progress);
-    return await action();
-  } catch (error: any) {
-    const specificError = error?.message || '';
-    const lowerError = specificError.toLowerCase();
-
-    const finalErrorMessage = getWebsocketErrorMessage(
-      lowerError,
-      errorMessage,
-    );
-
-    updateRequestProgress(id, RequestProgress.Error, finalErrorMessage);
-    await setNotaryRequestStatus(id, 'error');
-    await setNotaryRequestError(id, finalErrorMessage);
-    throw error;
-  }
-}

src/entries/Offscreen/types.ts

@@ -1,15 +0,0 @@
-export enum OffscreenActionTypes {
-  notarization_request = 'offscreen/notarization_request',
-  notarization_response = 'offscreen/notarization_response',
-  create_prover_request = 'offscreen/create_prover_request',
-  create_prover_response = 'offscreen/create_prover_response',
-  create_presentation_request = 'offscreen/create_presentation_request',
-  create_presentation_response = 'offscreen/create_presentation_response',
-  get_secrets_from_transcript_success = 'offscreen/get_secrets_from_transcript_success',
-  start_p2p_verifier = 'offscreen/start_p2p_verifier',
-  start_p2p_prover = 'offscreen/start_p2p_prover',
-  prover_started = 'offscreen/prover_started',
-  prover_setup = 'offscreen/prover_setup',
-  start_p2p_proof_request = 'offscreen/start_p2p_proof_request',
-  end_p2p_proof_request = 'offscreen/end_p2p_proof_request',
-}

src/entries/Offscreen/utils.ts

@@ -1,39 +0,0 @@
-export function subtractRanges(
-  ranges: { start: number; end: number },
-  negatives: { start: number; end: number }[],
-): { start: number; end: number }[] {
-  const returnVal: { start: number; end: number }[] = [ranges];
-
-  negatives
-    .sort((a, b) => (a.start < b.start ? -1 : 1))
-    .forEach(({ start, end }) => {
-      const last = returnVal.pop()!;
-
-      if (start < last.start || end > last.end) {
-        console.error('invalid ranges');
-        return;
-      }
-
-      if (start === last.start && end === last.end) {
-        return;
-      }
-
-      if (start === last.start && end < last.end) {
-        returnVal.push({ start: end, end: last.end });
-        return;
-      }
-
-      if (start > last.start && end < last.end) {
-        returnVal.push({ start: last.start, end: start });
-        returnVal.push({ start: end, end: last.end });
-        return;
-      }
-
-      if (start > last.start && end === last.end) {
-        returnVal.push({ start: last.start, end: start });
-        return;
-      }
-    });
-
-  return returnVal;
-}

src/entries/Offscreen/worker.ts

@@ -1,9 +0,0 @@
-import * as Comlink from 'comlink';
-import init, { Prover, Presentation, Verifier } from 'tlsn-js';
-
-Comlink.expose({
-  init,
-  Prover,
-  Presentation,
-  Verifier,
-});

src/entries/Options/index.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 
 import Options from '../../pages/Options';
-import './index.scss';
+import './index.css';
 
 const container = document.getElementById('app-container');
 const root = createRoot(container!); // createRoot(container!) if you use TypeScript

src/entries/Popup/Popup.tsx

@@ -1,8 +1,14 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { Navigate, Route, Routes, useNavigate } from 'react-router';
 import { useDispatch } from 'react-redux';
-import { setActiveTab, setRequests } from '../../reducers/requests';
+import {
+  setActiveTab,
+  setRequests,
+  useActiveTab,
+  useActiveTabUrl,
+} from '../../reducers/requests';
 import { BackgroundActiontype } from '../Background/rpc';
+import Requests from '../../pages/Requests';
 import Options from '../../pages/Options';
 import Request from '../../pages/Requests/Request';
 import Home from '../../pages/Home';
@@ -10,23 +16,16 @@ import logo from '../../assets/img/icon-128.png';
 import RequestBuilder from '../../pages/RequestBuilder';
 import Notarize from '../../pages/Notarize';
 import ProofViewer from '../../pages/ProofViewer';
+import History from '../../pages/History';
 import ProofUploader from '../../pages/ProofUploader';
 import browser from 'webextension-polyfill';
 import store from '../../utils/store';
-import { isPopupWindow } from '../../utils/misc';
-import { NotarizeApproval } from '../../pages/NotarizeApproval';
-import { MenuIcon } from '../../components/Menu';
-import { P2PHome } from '../../pages/PeerToPeer';
-import { fetchP2PState } from '../../reducers/p2p';
-import { RunPluginByUrlApproval } from '../../pages/RunPluginByUrlApproval';
 
 const Popup = () => {
   const dispatch = useDispatch();
+  const activeTab = useActiveTab();
+  const url = useActiveTabUrl();
   const navigate = useNavigate();
-  const [isPopup, setIsPopup] = useState(isPopupWindow());
-  useEffect(() => {
-    fetchP2PState();
-  }, []);
 
   useEffect(() => {
     (async () => {
@@ -74,7 +73,7 @@ const Popup = () => {
   }, []);
 
   return (
-    <div className="flex flex-col w-full h-full overflow-hidden lg:w-[600px] lg:h-[800px] lg:border lg:m-auto lg:mt-40 lg:bg-white lg:shadow">
+    <div className="flex flex-col w-full h-full overflow-hidden">
       <div className="flex flex-nowrap flex-shrink-0 flex-row items-center relative gap-2 h-9 p-2 cursor-default justify-center bg-slate-300 w-full">
         <img
           className="absolute left-2 h-5 cursor-pointer"
@@ -82,12 +81,15 @@ const Popup = () => {
           alt="logo"
           onClick={() => navigate('/')}
         />
-        <div className="flex flex-row flex-grow items-center justify-end gap-4">
-          {!isPopup && (
-            <>
-              <MenuIcon />
-            </>
+        <div className="absolute right-2 flex flex-nowrap flex-row items-center gap-1 justify-center w-fit">
+          {!!activeTab?.favIconUrl && (
+            <img
+              src={activeTab?.favIconUrl}
+              className="h-5 rounded-full"
+              alt="logo"
+            />
           )}
+          <div className="text-xs">{url?.hostname}</div>
         </div>
       </div>
       <Routes>
@@ -95,17 +97,11 @@ const Popup = () => {
         <Route path="/notary/:requestId" element={<Notarize />} />
         <Route path="/verify/:requestId/*" element={<ProofViewer />} />
         <Route path="/verify" element={<ProofUploader />} />
-        <Route path="/history" element={<Home tab="history" />} />
-        <Route path="/requests" element={<Home tab="network" />} />
+        <Route path="/history" element={<History />} />
+        <Route path="/requests" element={<Requests />} />
         <Route path="/custom/*" element={<RequestBuilder />} />
         <Route path="/options" element={<Options />} />
         <Route path="/home" element={<Home />} />
-        <Route path="/notarize-approval" element={<NotarizeApproval />} />
-        <Route
-          path="/run-plugin-approval"
-          element={<RunPluginByUrlApproval />}
-        />
-        <Route path="/p2p" element={<P2PHome />} />
         <Route path="*" element={<Navigate to="/home" />} />
       </Routes>
     </div>

src/entries/Popup/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>TLSN Extension</title>
+    <title>Popup</title>
   </head>
 
   <body>

src/entries/Popup/index.scss

@@ -30,10 +30,6 @@ code {
   width: 100vw;
   height: 100vh;
   overflow: hidden;
-
-  @media (min-width: 1024px) {
-    @apply bg-slate-400;
-  }
 }
 
 .button {

src/entries/Popup/index.tsx

@@ -4,12 +4,8 @@ import { HashRouter } from 'react-router-dom';
 import Popup from './Popup';
 import './index.scss';
 import { Provider } from 'react-redux';
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-dayjs.extend(relativeTime);
-dayjs.extend(localizedFormat);
 import store from '../../utils/store';
+import { BackgroundActiontype } from '../Background/rpc';
 
 const container = document.getElementById('app-container');
 const root = createRoot(container!); // createRoot(container!) if you use TypeScript

src/entries/SidePanel/SidePanel.tsx

@@ -1,89 +1,34 @@
 import React, { ReactElement, useCallback, useEffect, useState } from 'react';
 import './sidePanel.scss';
 import browser from 'webextension-polyfill';
-import {
-  getPluginConfig,
-  hexToArrayBuffer,
-  makePlugin,
-  PluginConfig,
-  StepConfig,
-} from '../../utils/misc';
+import { fetchPluginConfigByHash, runPlugin } from '../../utils/rpc';
+import { PluginConfig, StepConfig } from '../../utils/misc';
+import { PluginList } from '../../components/PluginList';
 import DefaultPluginIcon from '../../assets/img/default-plugin-icon.png';
 import logo from '../../assets/img/icon-128.png';
 import classNames from 'classnames';
 import Icon from '../../components/Icon';
 import { useRequestHistory } from '../../reducers/history';
-import {
-  BackgroundActiontype,
-  progressText,
-  RequestProgress,
-} from '../Background/rpc';
-import { getPluginByUrl, getPluginConfigByUrl } from '../Background/db';
-import { SidePanelActionTypes } from './types';
-import { fetchP2PState, useClientId } from '../../reducers/p2p';
+import { BackgroundActiontype } from '../Background/rpc';
 
 export default function SidePanel(): ReactElement {
   const [config, setConfig] = useState<PluginConfig | null>(null);
-  const [url, setUrl] = useState('');
-  const [hex, setHex] = useState('');
-  const [p2p, setP2P] = useState(false);
-  const [params, setParams] = useState<Record<string, string> | undefined>();
-  const [started, setStarted] = useState(false);
-  const clientId = useClientId();
+  const [hash, setHash] = useState('');
 
   useEffect(() => {
-    fetchP2PState();
-    browser.runtime.sendMessage({
-      type: SidePanelActionTypes.panel_opened,
-    });
-  }, []);
-
-  useEffect(() => {
-    browser.runtime.onMessage.addListener(async (request) => {
-      const { type, data } = request;
-
-      switch (type) {
-        case SidePanelActionTypes.execute_plugin_request: {
-          const pluginIdentifier = data.pluginUrl || data.pluginHash;
-          setConfig(await getPluginConfigByUrl(pluginIdentifier));
-          setUrl(pluginIdentifier);
-          setParams(data.pluginParams);
-          setStarted(true);
-          break;
-        }
-        case SidePanelActionTypes.run_p2p_plugin_request: {
-          const { pluginHash, plugin } = data;
-          const config =
-            (await getPluginConfigByUrl(pluginHash)) ||
-            (await getPluginConfig(hexToArrayBuffer(plugin)));
-
-          setUrl(pluginHash);
-          setHex(plugin);
-          setP2P(true);
-          setConfig(config);
-          break;
-        }
-        case SidePanelActionTypes.start_p2p_plugin: {
-          setStarted(true);
-          break;
-        }
-        case SidePanelActionTypes.is_panel_open: {
-          return { isOpen: true };
-        }
-        case SidePanelActionTypes.reset_panel: {
-          setConfig(null);
-          setUrl('');
-          setHex('');
-          setStarted(false);
-          break;
-        }
-      }
-    });
+    (async function () {
+      const result = await browser.storage.local.get('plugin_hash');
+      const { plugin_hash } = result;
+      const config = await fetchPluginConfigByHash(plugin_hash);
+      setHash(plugin_hash);
+      setConfig(config);
+      // await browser.storage.local.set({ plugin_hash: '' });
+    })();
   }, []);
 
   return (
     <div className="flex flex-col bg-slate-100 w-screen h-screen">
-      <div className="relative flex flex-nowrap flex-shrink-0 flex-row items-center gap-2 h-9 p-2 cursor-default justify-center bg-slate-300 w-full">
+      <div className="relative flex flex-nowrap flex-shrink-0 flex-row items-center relative gap-2 h-9 p-2 cursor-default justify-center bg-slate-300 w-full">
         <img className="h-5" src={logo} alt="logo" />
         <button
           className="button absolute right-2"
@@ -92,85 +37,29 @@ export default function SidePanel(): ReactElement {
           Close
         </button>
       </div>
-      {/*{!config && <PluginList />}*/}
-
-      {started && config && (
-        <PluginBody
-          url={url}
-          hex={hex}
-          config={config}
-          p2p={p2p}
-          clientId={clientId}
-          presetParameterValues={params}
-        />
-      )}
+      {!config && <PluginList />}
+      {config && <PluginBody hash={hash} config={config} />}
     </div>
   );
 }
 
-function PluginBody({
-  url,
-  hex,
-  config,
-  p2p,
-  clientId,
-  presetParameterValues,
-}: {
+function PluginBody(props: {
   config: PluginConfig;
-  url: string;
-  hex?: string;
-  clientId?: string;
-  p2p?: boolean;
-  presetParameterValues?: Record<string, string>;
+  hash: string;
 }): ReactElement {
-  const { title, description, icon, steps } = config;
+  const { hash } = props;
+  const { title, description, icon, steps } = props.config;
   const [responses, setResponses] = useState<any[]>([]);
-  const [notarizationId, setNotarizationId] = useState('');
-  const notaryRequest = useRequestHistory(notarizationId);
 
   const setResponse = useCallback(
     (response: any, i: number) => {
       const result = responses.concat();
       result[i] = response;
       setResponses(result);
-      if (i === steps!.length - 1 && !!response) {
-        setNotarizationId(response);
-      }
     },
-    [url, responses],
+    [responses],
   );
 
-  useEffect(() => {
-    if (notaryRequest?.status === 'success') {
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_response,
-        data: {
-          url,
-          proof: notaryRequest.proof,
-        },
-      });
-    } else if (notaryRequest?.sessionId) {
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_response,
-        data: {
-          url,
-          sessionId: notaryRequest.sessionId,
-        },
-      });
-    } else if (notaryRequest?.status === 'error') {
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_response,
-        data: {
-          url,
-          error:
-            notaryRequest.errorMessage ||
-            notaryRequest.error ||
-            'Notarization failed',
-        },
-      });
-    }
-  }, [url, notaryRequest?.status, notaryRequest?.sessionId]);
-
   return (
     <div className="flex flex-col p-4">
       <div className="flex flex-row items-center gap-4">
@@ -185,17 +74,11 @@ function PluginBody({
       <div className="flex flex-col items-start gap-8 mt-8">
         {steps?.map((step, i) => (
           <StepContent
-            key={i}
-            url={url}
-            config={config}
-            hex={hex}
+            hash={hash}
             index={i}
             setResponse={setResponse}
             lastResponse={i > 0 ? responses[i - 1] : undefined}
             responses={responses}
-            p2p={p2p}
-            clientId={clientId}
-            parameterValues={presetParameterValues}
             {...step}
           />
         ))}
@@ -206,16 +89,11 @@ function PluginBody({
 
 function StepContent(
   props: StepConfig & {
-    url: string;
-    hex?: string;
-    clientId?: string;
+    hash: string;
     index: number;
     setResponse: (resp: any, i: number) => void;
     responses: any[];
     lastResponse?: any;
-    config: PluginConfig;
-    p2p?: boolean;
-    parameterValues?: Record<string, string>;
   },
 ): ReactElement {
   const {
@@ -224,15 +102,10 @@ function StepContent(
     description,
     cta,
     action,
+    hash,
     setResponse,
     lastResponse,
     prover,
-    url,
-    hex: _hex,
-    config,
-    p2p = false,
-    clientId = '',
-    parameterValues,
   } = props;
   const [completed, setCompleted] = useState(false);
   const [pending, setPending] = useState(false);
@@ -240,41 +113,26 @@ function StepContent(
   const [notarizationId, setNotarizationId] = useState('');
   const notaryRequest = useRequestHistory(notarizationId);
 
-  const getPlugin = useCallback(async () => {
-    const hex = (await getPluginByUrl(url)) || _hex;
-    const arrayBuffer = hexToArrayBuffer(hex!);
-    return makePlugin(arrayBuffer, config, { p2p, clientId });
-  }, [url, _hex, config, p2p, clientId]);
-
   const processStep = useCallback(async () => {
-    const plugin = await getPlugin();
-    if (!plugin) return;
     if (index > 0 && !lastResponse) return;
 
     setPending(true);
-    setError('');
-
     try {
-      const out = await plugin.call(
-        action,
-        index > 0
-          ? JSON.stringify(lastResponse)
-          : JSON.stringify(parameterValues),
-      );
-      const val = JSON.parse(out!.string());
+      setError('');
+      const val = await runPlugin(hash, action, JSON.stringify(lastResponse));
       if (val && prover) {
         setNotarizationId(val);
       } else {
         setCompleted(!!val);
+        setResponse(val, index);
       }
-      setResponse(val, index);
     } catch (e: any) {
       console.error(e);
-      setError(e?.message || 'Unknown error');
+      setError(e?.message || 'Unkonwn error');
     } finally {
       setPending(false);
     }
-  }, [action, index, lastResponse, prover, getPlugin]);
+  }, [hash, action, index, lastResponse, prover]);
 
   const onClick = useCallback(() => {
     if (
@@ -305,39 +163,13 @@ function StepContent(
     });
   }, [notaryRequest, notarizationId]);
 
-  const viewP2P = useCallback(async () => {
-    await browser.runtime.sendMessage({
-      type: BackgroundActiontype.open_popup,
-      data: {
-        position: {
-          left: window.screen.width / 2 - 240,
-          top: window.screen.height / 2 - 300,
-        },
-        route: `/p2p`,
-      },
-    });
-  }, []);
-
   useEffect(() => {
     processStep();
   }, [processStep]);
 
   let btnContent = null;
 
-  console.log('notaryRequest', notaryRequest);
-  console.log('notarizationId', notarizationId);
-  if (prover && p2p) {
-    btnContent = (
-      <button
-        className={classNames(
-          'button button--primary mt-2 w-fit flex flex-row flex-nowrap items-center gap-2',
-        )}
-        onClick={viewP2P}
-      >
-        <span className="text-sm">View in P2P</span>
-      </button>
-    );
-  } else if (completed || notaryRequest?.sessionId) {
+  if (completed) {
     btnContent = (
       <button
         className={classNames(
@@ -357,38 +189,15 @@ function StepContent(
         )}
         onClick={viewProofInPopup}
       >
-        <span className="text-sm">View</span>
+        <span className="text-sm">View Proof</span>
       </button>
     );
   } else if (notaryRequest?.status === 'pending' || pending || notarizationId) {
     btnContent = (
-      <div className="flex flex-col gap-2">
-        {notaryRequest?.progress === RequestProgress.Error && (
-          <div className="flex flex-col gap-1">
-            <div className="flex flex-row items-start gap-2 text-red-600">
-              <Icon
-                fa="fa-solid fa-triangle-exclamation"
-                size={1}
-                className="mt-0.5"
-              />
-              <span className="text-sm">
-                {notaryRequest?.errorMessage ||
-                  progressText(notaryRequest.progress)}
-              </span>
-            </div>
-          </div>
-        )}
-        {notaryRequest?.progress !== RequestProgress.Error && (
-          <button className="button mt-2 w-fit flex flex-row flex-nowrap items-center gap-2 cursor-default">
-            <Icon className="animate-spin" fa="fa-solid fa-spinner" size={1} />
-            <span className="text-sm">
-              {notaryRequest?.progress !== undefined
-                ? `(${(((notaryRequest.progress + 1) / 6.06) * 100).toFixed()}%) ${progressText(notaryRequest.progress)}`
-                : 'Pending...'}
-            </span>
-          </button>
-        )}
-      </div>
+      <button className="button mt-2 w-fit flex flex-row flex-nowrap items-center gap-2 cursor-default">
+        <Icon className="animate-spin" fa="fa-solid fa-spinner" size={1} />
+        <span className="text-sm">{cta}</span>
+      </button>
     );
   } else {
     btnContent = (
@@ -418,18 +227,7 @@ function StepContent(
         {!!description && (
           <div className="text-slate-500 text-sm">{description}</div>
         )}
-        {!!error && (
-          <div className="flex flex-col gap-1">
-            <div className="flex flex-row items-start gap-2 text-red-600">
-              <Icon
-                fa="fa-solid fa-triangle-exclamation"
-                size={1}
-                className="mt-0.5"
-              />
-              <div className="text-red-500 text-sm">{error}</div>
-            </div>
-          </div>
-        )}
+        {!!error && <div className="text-red-500 text-sm">{error}</div>}
         {btnContent}
       </div>
     </div>

src/entries/SidePanel/types.ts

@@ -1,10 +0,0 @@
-export enum SidePanelActionTypes {
-  panel_opened = 'sidePanel/panel_opened',
-  execute_plugin_request = 'sidePanel/execute_plugin_request',
-  execute_plugin_response = 'sidePanel/execute_plugin_response',
-  run_p2p_plugin_request = 'sidePanel/run_p2p_plugin_request',
-  run_p2p_plugin_response = 'sidePanel/run_p2p_plugin_response',
-  start_p2p_plugin = 'sidePanel/start_p2p_plugin',
-  is_panel_open = 'sidePanel/is_panel_open',
-  reset_panel = 'sidePanel/reset_panel',
-}

src/entries/utils.ts

@@ -1,74 +0,0 @@
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from './Background/rpc';
-import { SidePanelActionTypes } from './SidePanel/types';
-import { deferredPromise } from '../utils/promise';
-import { devlog } from '../utils/misc';
-
-export const pushToRedux = async (action: {
-  type: string;
-  payload?: any;
-  error?: boolean;
-  meta?: any;
-}) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.push_action,
-    data: {
-      tabId: 'background',
-    },
-    action,
-  });
-};
-
-export const openSidePanel = async () => {
-  const { promise, resolve, reject } = deferredPromise();
-
-  try {
-    const response = await browser.runtime.sendMessage({
-      type: SidePanelActionTypes.is_panel_open,
-    });
-
-    if (response?.isOpen) {
-      await browser.runtime.sendMessage({
-        type: SidePanelActionTypes.reset_panel,
-      });
-      resolve();
-      return promise;
-    }
-
-    const [tab] = await browser.tabs.query({
-      active: true,
-      currentWindow: true,
-    });
-
-    const listener = async (request: any) => {
-      if (request.type === SidePanelActionTypes.panel_opened) {
-        browser.runtime.onMessage.removeListener(listener);
-        resolve();
-      }
-    };
-
-    browser.runtime.onMessage.addListener(listener);
-    // @ts-ignore
-    if (chrome.sidePanel) await chrome.sidePanel.open({ tabId: tab.id });
-  } catch (e) {
-    reject(e);
-  }
-
-  return promise;
-};
-
-export const waitForEvent = async (event: string) => {
-  const { promise, resolve } = deferredPromise();
-
-  const listener = async (request: any) => {
-    if (request.type === event) {
-      devlog('received event:', event);
-      browser.runtime.onMessage.removeListener(listener);
-      resolve(request);
-    }
-  };
-
-  browser.runtime.onMessage.addListener(listener);
-
-  return promise;
-};

src/manifest.json

@@ -3,8 +3,8 @@
   "name": "TLSN Extension",
   "description": "A chrome extension for TLSN",
   "options_page": "options.html",
-  "background": {
-    "service_worker": "background.bundle.js"
+  "background": { "service_worker": "background.bundle.js",
+    "persistent": true
   },
   "action": {
     "default_popup": "popup.html",
@@ -28,8 +28,8 @@
   ],
   "web_accessible_resources": [
     {
-      "resources": ["content.styles.css", "icon-128.png", "icon-34.png", "content.bundle.js", "discord_dm.wasm", "twitter_profile.wasm"],
-      "matches": ["http://*/*", "https://*/*", "<all_urls>"]
+      "resources": ["content.styles.css", "icon-128.png", "icon-34.png"],
+      "matches": []
     }
   ],
   "host_permissions": ["<all_urls>"],

src/pages/BaseApproval/index.tsx

@@ -1,44 +0,0 @@
-import React, { ReactElement, ReactNode } from 'react';
-import logo from '../../assets/img/icon-128.png';
-
-export function BaseApproval({
-  onSecondaryClick,
-  onPrimaryClick,
-  header,
-  children,
-  secondaryCTAText = 'Cancel',
-  primaryCTAText = 'Accept',
-}: {
-  header: ReactNode;
-  children: ReactNode;
-  onSecondaryClick: () => void;
-  onPrimaryClick: () => void;
-  secondaryCTAText?: string;
-  primaryCTAText?: string;
-}): ReactElement {
-  return (
-    <div className="absolute flex flex-col items-center w-screen h-screen bg-white gap-2 cursor-default">
-      <div className="w-full p-2 border-b border-gray-200 text-gray-500">
-        <div className="flex flex-row items-end justify-start gap-2">
-          <img className="h-5" src={logo} alt="logo" />
-          <span className="font-semibold">{header}</span>
-        </div>
-      </div>
-      <div className="flex flex-col flex-grow gap-2 overflow-y-auto w-full">
-        {children}
-      </div>
-      <div className="flex flex-row w-full gap-2 justify-end border-t p-4">
-        {!!onSecondaryClick && !!secondaryCTAText && (
-          <button className="button" onClick={onSecondaryClick}>
-            {secondaryCTAText}
-          </button>
-        )}
-        {!!onPrimaryClick && !!primaryCTAText && (
-          <button className="button button--primary" onClick={onPrimaryClick}>
-            {primaryCTAText}
-          </button>
-        )}
-      </div>
-    </div>
-  );
-}

src/pages/History/index.tsx

@@ -1,50 +1,82 @@
-import React, { ReactElement, useState, useCallback } from 'react';
+import React, { ReactElement, useState, useCallback, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router';
-import { useHistoryOrder, useRequestHistory } from '../../reducers/history';
-import Icon from '../../components/Icon';
-import NotarizeIcon from '../../assets/img/notarize.png';
-import { urlify } from '../../utils/misc';
 import {
-  BackgroundActiontype,
-  progressText,
-  RequestProgress,
-} from '../../entries/Background/rpc';
+  useHistoryOrder,
+  useRequestHistory,
+  deleteRequestHistory,
+} from '../../reducers/history';
+import Icon from '../../components/Icon';
+import {
+  get,
+  NOTARY_API_LS_KEY,
+  PROXY_API_LS_KEY,
+  getNotaryApi,
+  getProxyApi,
+} from '../../utils/storage';
+import { urlify, download, upload } from '../../utils/misc';
+import { BackgroundActiontype } from '../../entries/Background/rpc';
 import Modal, { ModalContent } from '../../components/Modal/Modal';
 import classNames from 'classnames';
-import dayjs from 'dayjs';
-import RequestMenu from './request-menu';
-
-const charwise = require('charwise');
+import copy from 'copy-to-clipboard';
+import { EXPLORER_API } from '../../utils/constants';
+import {
+  getNotaryRequest,
+  setNotaryRequestCid,
+} from '../../entries/Background/db';
 
 export default function History(): ReactElement {
   const history = useHistoryOrder();
 
   return (
-    <div className="flex flex-col flex-nowrap overflow-y-auto pb-36">
-      {history
-        .map((id) => {
-          return <OneRequestHistory key={id} requestId={id} />;
-        })
-        .reverse()}
+    <div className="flex flex-col flex-nowrap overflow-y-auto">
+      {history.map((id) => {
+        return <OneRequestHistory key={id} requestId={id} />;
+      })}
     </div>
   );
 }
 
-export function OneRequestHistory(props: {
-  requestId: string;
-  className?: string;
-  hideActions?: string[];
-}): ReactElement {
-  const { hideActions = [] } = props;
+function OneRequestHistory(props: { requestId: string }): ReactElement {
   const dispatch = useDispatch();
   const request = useRequestHistory(props.requestId);
   const [showingError, showError] = useState(false);
-  const [showingMenu, showMenu] = useState(false);
+  const [uploadError, setUploadError] = useState('');
+  const [showingShareConfirmation, setShowingShareConfirmation] =
+    useState(false);
+  const [cid, setCid] = useState<{ [key: string]: string }>({});
+  const [uploading, setUploading] = useState(false);
   const navigate = useNavigate();
   const { status } = request || {};
   const requestUrl = urlify(request?.url || '');
 
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const request = await getNotaryRequest(props.requestId);
+        if (request && request.cid) {
+          setCid({ [props.requestId]: request.cid });
+        }
+      } catch (e) {
+        console.error('Error fetching data', e);
+      }
+    };
+    fetchData();
+  }, []);
+
+  const onRetry = useCallback(async () => {
+    const notaryUrl = await getNotaryApi();
+    const websocketProxyUrl = await getProxyApi();
+    chrome.runtime.sendMessage<any, string>({
+      type: BackgroundActiontype.retry_prove_request,
+      data: {
+        id: props.requestId,
+        notaryUrl,
+        websocketProxyUrl,
+      },
+    });
+  }, [props.requestId]);
+
   const onView = useCallback(() => {
     chrome.runtime.sendMessage<any, string>({
       type: BackgroundActiontype.verify_prove_request,
@@ -53,99 +85,132 @@ export function OneRequestHistory(props: {
     navigate('/verify/' + request?.id);
   }, [request]);
 
+  const onDelete = useCallback(async () => {
+    dispatch(deleteRequestHistory(props.requestId));
+  }, [props.requestId]);
+
   const onShowError = useCallback(async () => {
     showError(true);
   }, [request?.error, showError]);
 
   const closeAllModal = useCallback(() => {
+    setShowingShareConfirmation(false);
     showError(false);
-  }, [showError]);
+  }, [setShowingShareConfirmation, showError]);
 
-  const day = dayjs(charwise.decode(props.requestId, 'hex'));
+  const handleUpload = useCallback(async () => {
+    setUploading(true);
+    try {
+      const data = await upload(
+        `${request?.id}.json`,
+        JSON.stringify(request?.proof),
+      );
+      setCid((prevCid) => ({ ...prevCid, [props.requestId]: data }));
+      await setNotaryRequestCid(props.requestId, data);
+    } catch (e: any) {
+      setUploadError(e.message);
+    } finally {
+      setUploading(false);
+    }
+  }, [props.requestId, request, cid]);
 
   return (
-    <div
-      className={classNames(
-        'flex flex-row items-center flex-nowrap border rounded-md px-2.5 py-3 gap-0.5 hover:bg-slate-50 cursor-pointer relative',
-        {
-          '!cursor-default !bg-slate-200': status === 'pending',
-        },
-        props.className,
-      )}
-      onClick={() => {
-        if (status === 'success') onView();
-        if (status === 'error') onShowError();
-      }}
-    >
+    <div className="flex flex-row flex-nowrap border rounded-md p-2 gap-1 hover:bg-slate-50 cursor-pointer">
+      <ShareConfirmationModal />
       <ErrorModal />
-      <div className="w-12 h-12 rounded-full flex flex-row items-center justify-center bg-slate-300">
-        <img
-          className="relative w-7 h-7 top-[-1px] opacity-60"
-          src={NotarizeIcon}
-        />
-      </div>
-      <div className="flex flex-col flex-nowrap flex-grow flex-shrink w-0 gap-1">
-        <div className="flex flex-row text-black text-sm font-semibold px-2 rounded-md overflow-hidden text-ellipsis gap-1">
-          <span>Notarize request</span>
-          <span className="font-normal border-b border-dashed border-slate-400 text-slate-500">
-            {requestUrl?.hostname}
-          </span>
+      <div className="flex flex-col flex-nowrap flex-grow flex-shrink w-0">
+        <div className="flex flex-row items-center text-xs">
+          <div className="bg-slate-200 text-slate-400 px-1 py-0.5 rounded-sm">
+            {request?.method}
+          </div>
+          <div className="text-black font-bold px-2 py-1 rounded-md overflow-hidden text-ellipsis">
+            {requestUrl?.pathname}
+          </div>
         </div>
-        <div
-          className={classNames('font-semibold px-2 rounded-sm w-fit', {
-            'text-green-600': status === 'success',
-            'text-red-600': status === 'error',
-          })}
+        <div className="flex flex-row">
+          <div className="font-bold text-slate-400">Host:</div>
+          <div className="ml-2 text-slate-800">{requestUrl?.host}</div>
+        </div>
+        <div className="flex flex-row">
+          <div className="font-bold text-slate-400">Notary API:</div>
+          <div className="ml-2 text-slate-800">{request?.notaryUrl}</div>
+        </div>
+        <div className="flex flex-row">
+          <div className="font-bold text-slate-400">TLS Proxy API: </div>
+          <div className="ml-2 text-slate-800">
+            {request?.websocketProxyUrl}
+          </div>
+        </div>
+      </div>
+      <div className="flex flex-col gap-1">
+        {status === 'success' && (
+          <>
+            <ActionButton
+              className="bg-slate-600 text-slate-200 hover:bg-slate-500 hover:text-slate-100"
+              onClick={onView}
+              fa="fa-solid fa-receipt"
+              ctaText="View Proof"
+            />
+            <ActionButton
+              className="bg-slate-100 text-slate-300 hover:bg-slate-200 hover:text-slate-500"
+              onClick={() =>
+                download(`${request?.id}.json`, JSON.stringify(request?.proof))
+              }
+              fa="fa-solid fa-download"
+              ctaText="Download"
+            />
+            <ActionButton
+              className="flex flex-row flex-grow-0 gap-2 self-end items-center justify-end px-2 py-1 bg-slate-100 text-slate-300 hover:bg-slate-200 hover:text-slate-500 hover:font-bold"
+              onClick={() => setShowingShareConfirmation(true)}
+              fa="fa-solid fa-upload"
+              ctaText="Share"
+            />
+          </>
+        )}
+        {status === 'error' && !!request?.error && <ErrorButton />}
+        {(!status || status === 'error') && <RetryButton />}
+        {status === 'pending' && (
+          <button className="flex flex-row flex-grow-0 gap-2 self-end items-center justify-end px-2 py-1 bg-slate-100 text-slate-300 font-bold">
+            <Icon className="animate-spin" fa="fa-solid fa-spinner" size={1} />
+            <span className="text-xs font-bold">Pending</span>
+          </button>
+        )}
+        <button
+          className="flex flex-row flex-grow-0 gap-2 self-end items-center justify-end px-2 py-1 bg-slate-100 text-slate-300 hover:bg-red-100 hover:text-red-500 hover:font-bold"
+          onClick={onDelete}
         >
-          {status === 'success' && 'Success'}
-          {status === 'error' && 'Error'}
-          {status === 'pending' && (
-            <div className="text-center flex flex-row flex-grow-0 gap-2 self-end items-center justify-center text-slate-600">
-              <Icon
-                className="animate-spin"
-                fa="fa-solid fa-spinner"
-                size={1}
-              />
-              <span className="">
-                {request?.progress === RequestProgress.Error
-                  ? `${progressText(request.progress, request.errorMessage)}`
-                  : request?.progress
-                    ? `(${(
-                        ((request.progress + 1) / 6.06) *
-                        100
-                      ).toFixed()}%) ${progressText(request.progress)}`
-                    : 'Pending...'}
-              </span>
-            </div>
-          )}
-        </div>
-      </div>
-      <div className="flex flex-col items-end gap-1">
-        <div className="h-4">
-          {!hideActions.length && (
-            <Icon
-              className="text-slate-500 hover:text-slate-600 relative"
-              fa="fa-solid fa-ellipsis"
-              onClick={(e) => {
-                e.stopPropagation();
-                showMenu(true);
-              }}
-            >
-              {showingMenu && (
-                <RequestMenu requestId={props.requestId} showMenu={showMenu} />
-              )}
-            </Icon>
-          )}
-        </div>
-        <div className="text-slate-500" title={day.format('LLLL')}>
-          {day.fromNow()}
-        </div>
+          <Icon className="" fa="fa-solid fa-trash" size={1} />
+          <span className="text-xs font-bold">Delete</span>
+        </button>
       </div>
     </div>
   );
 
+  function RetryButton(): ReactElement {
+    return (
+      <button
+        className="flex flex-row flex-grow-0 gap-2 self-end items-center justify-end px-2 py-1 bg-slate-100 text-slate-300 hover:bg-slate-200 hover:text-slate-500 hover:font-bold"
+        onClick={onRetry}
+      >
+        <Icon fa="fa-solid fa-arrows-rotate" size={1} />
+        <span className="text-xs font-bold">Retry</span>
+      </button>
+    );
+  }
+
+  function ErrorButton(): ReactElement {
+    return (
+      <button
+        className="flex flex-row flex-grow-0 gap-2 self-end items-center justify-end px-2 py-1 bg-red-100 text-red-300 hover:bg-red-200 hover:text-red-500 hover:font-bold"
+        onClick={onShowError}
+      >
+        <Icon fa="fa-solid fa-circle-exclamation" size={1} />
+        <span className="text-xs font-bold">Error</span>
+      </button>
+    );
+  }
+
   function ErrorModal(): ReactElement {
-    const msg = typeof request?.error === 'string' && request?.error;
     return !showingError ? (
       <></>
     ) : (
@@ -154,7 +219,7 @@ export function OneRequestHistory(props: {
         onClose={closeAllModal}
       >
         <ModalContent className="flex justify-center items-center text-slate-500">
-          {msg || request?.errorMessage}
+          {request?.error || 'Something went wrong :('}
         </ModalContent>
         <button
           className="m-0 w-24 bg-red-100 text-red-300 hover:bg-red-200 hover:text-red-500"
@@ -165,4 +230,96 @@ export function OneRequestHistory(props: {
       </Modal>
     );
   }
+
+  function ShareConfirmationModal(): ReactElement {
+    return !showingShareConfirmation ? (
+      <></>
+    ) : (
+      <Modal
+        className="flex flex-col items-center text-base cursor-default justify-center !w-auto mx-4 my-[50%] p-4 gap-4"
+        onClose={closeAllModal}
+      >
+        <ModalContent className="flex flex-col w-full gap-4 items-center text-base justify-center">
+          {!cid[props.requestId] ? (
+            <p className="text-slate-500 text-center">
+              {uploadError ||
+                'This will make your proof publicly accessible by anyone with the CID'}
+            </p>
+          ) : (
+            <input
+              className="input w-full bg-slate-100 border border-slate-200"
+              readOnly
+              value={`${EXPLORER_API}/ipfs/${cid[props.requestId]}`}
+              onFocus={(e) => e.target.select()}
+            />
+          )}
+        </ModalContent>
+        <div className="flex flex-row gap-2 justify-center">
+          {!cid[props.requestId] ? (
+            <>
+              {!uploadError && (
+                <button
+                  onClick={handleUpload}
+                  className="button button--primary flex flex-row items-center justify-center gap-2 m-0"
+                  disabled={uploading}
+                >
+                  {uploading && (
+                    <Icon
+                      className="animate-spin"
+                      fa="fa-solid fa-spinner"
+                      size={1}
+                    />
+                  )}
+                  I understand
+                </button>
+              )}
+              <button
+                className="m-0 w-24 bg-slate-100 text-slate-400 hover:bg-slate-200 hover:text-slate-600 font-bold"
+                onClick={closeAllModal}
+              >
+                Close
+              </button>
+            </>
+          ) : (
+            <>
+              <button
+                onClick={() =>
+                  copy(`${EXPLORER_API}/ipfs/${cid[props.requestId]}`)
+                }
+                className="m-0 w-24 bg-slate-600 text-slate-200 hover:bg-slate-500 hover:text-slate-100 font-bold"
+              >
+                Copy
+              </button>
+              <button
+                className="m-0 w-24 bg-slate-100 text-slate-400 hover:bg-slate-200 hover:text-slate-600 font-bold"
+                onClick={closeAllModal}
+              >
+                Close
+              </button>
+            </>
+          )}
+        </div>
+      </Modal>
+    );
+  }
+}
+
+function ActionButton(props: {
+  onClick: () => void;
+  fa: string;
+  ctaText: string;
+  className?: string;
+}): ReactElement {
+  return (
+    <button
+      className={classNames(
+        'flex flex-row flex-grow-0 gap-2 self-end items-center justify-end px-2 py-1 hover:font-bold',
+        props.className,
+      )}
+      onClick={props.onClick}
+    >
+      <Icon className="" fa={props.fa} size={1} />
+      <span className="text-xs font-bold">{props.ctaText}</span>
+    </button>
+  );
 }

src/pages/History/request-menu.tsx

@@ -1,307 +0,0 @@
-import React, {
-  MouseEventHandler,
-  ReactElement,
-  ReactNode,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
-import classNames from 'classnames';
-import Icon from '../../components/Icon';
-import {
-  addRequestCid,
-  deleteRequestHistory,
-  useRequestHistory,
-} from '../../reducers/history';
-import { download, upload } from '../../utils/misc';
-import Modal, { ModalContent } from '../../components/Modal/Modal';
-import { EXPLORER_API } from '../../utils/constants';
-import copy from 'copy-to-clipboard';
-import { setNotaryRequestCid } from '../../entries/Background/db';
-import { useDispatch } from 'react-redux';
-import { getNotaryApi, getProxyApi } from '../../utils/storage';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-
-export default function RequestMenu({
-  requestId,
-  showMenu,
-}: {
-  showMenu: (opened: boolean) => void;
-  requestId: string;
-}): ReactElement {
-  const dispatch = useDispatch();
-  const request = useRequestHistory(requestId);
-  const [showingShareConfirmation, setShowingShareConfirmation] =
-    useState(false);
-  const [showRemoveModal, setShowRemoveModal] = useState(false);
-
-  const onRetry = useCallback(async () => {
-    const notaryUrl = await getNotaryApi();
-    const websocketProxyUrl = await getProxyApi();
-    chrome.runtime.sendMessage<any, string>({
-      type: BackgroundActiontype.retry_prove_request,
-      data: {
-        id: requestId,
-        notaryUrl,
-        websocketProxyUrl,
-      },
-    });
-  }, [requestId]);
-
-  const onDelete = useCallback(async () => {
-    dispatch(deleteRequestHistory(requestId));
-  }, [requestId]);
-
-  if (!request) return <></>;
-
-  const { status } = request;
-
-  return (
-    <>
-      {showingShareConfirmation && (
-        <ShareConfirmationModal
-          requestId={requestId}
-          setShowingShareConfirmation={setShowingShareConfirmation}
-          showMenu={showMenu}
-        />
-      )}
-      <RemoveHistory
-        onRemove={onDelete}
-        showRemovalModal={showRemoveModal}
-        setShowRemoveModal={setShowRemoveModal}
-        onCancel={() => setShowRemoveModal(false)}
-      />
-      <div
-        className="fixed top-0 left-0 w-screen h-screen z-10 cursor-default"
-        onClick={(e) => {
-          e.stopPropagation();
-          showMenu(false);
-        }}
-      />
-      <div className="absolute top-[100%] right-0 rounded-md z-20">
-        <div className="flex flex-col bg-slate-200 w-40 shadow rounded-md py">
-          {status === 'success' && (
-            <>
-              <RequestMenuRow
-                fa="fa-solid fa-download"
-                className="border-b border-slate-300"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  showMenu(false);
-                  download(`${request.id}.json`, JSON.stringify(request.proof));
-                }}
-              >
-                Download
-              </RequestMenuRow>
-              <RequestMenuRow
-                fa="fa-solid fa-upload"
-                className="border-b border-slate-300"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setShowingShareConfirmation(true);
-                }}
-              >
-                Share
-              </RequestMenuRow>
-            </>
-          )}
-          {status === 'error' && (
-            <RequestMenuRow
-              fa="fa-solid fa-arrows-rotate"
-              className="border-b border-slate-300"
-              onClick={(e) => {
-                e.stopPropagation();
-                onRetry();
-                showMenu(false);
-              }}
-            >
-              Retry
-            </RequestMenuRow>
-          )}
-          <RequestMenuRow
-            fa="fa-solid fa-trash"
-            className="border-b border-slate-300 !text-red-500"
-            onClick={(e) => {
-              e.stopPropagation();
-              setShowRemoveModal(true);
-            }}
-          >
-            Delete
-          </RequestMenuRow>
-        </div>
-      </div>
-    </>
-  );
-}
-
-function RequestMenuRow(props: {
-  fa: string;
-  children?: ReactNode;
-  onClick?: MouseEventHandler;
-  className?: string;
-}): ReactElement {
-  return (
-    <div
-      className={classNames(
-        'flex flex-row items-center py-3 px-4 gap-2 hover:bg-slate-300 cursor-pointer text-slate-800 hover:text-slate-900 font-semibold',
-        props.className,
-      )}
-      onClick={props.onClick}
-    >
-      <Icon size={0.875} fa={props.fa} />
-      {props.children}
-    </div>
-  );
-}
-
-function ShareConfirmationModal({
-  setShowingShareConfirmation,
-  requestId,
-  showMenu,
-}: {
-  showMenu: (opened: boolean) => void;
-  setShowingShareConfirmation: (showing: boolean) => void;
-  requestId: string;
-}): ReactElement {
-  const dispatch = useDispatch();
-  const request = useRequestHistory(requestId);
-  const [uploadError, setUploadError] = useState('');
-  const [uploading, setUploading] = useState(false);
-
-  const handleUpload = useCallback(async () => {
-    setUploading(true);
-    try {
-      const data = await upload(
-        `${request?.id}.json`,
-        JSON.stringify(request?.proof),
-      );
-      await setNotaryRequestCid(requestId, data);
-      dispatch(addRequestCid(requestId, data));
-    } catch (e: any) {
-      setUploadError(e.message);
-    } finally {
-      setUploading(false);
-    }
-  }, [requestId, request, request?.cid]);
-
-  const onClose = useCallback(() => {
-    setShowingShareConfirmation(false);
-    showMenu(false);
-  }, [showMenu]);
-
-  return !request ? (
-    <></>
-  ) : (
-    <Modal
-      className="flex flex-col items-center text-base cursor-default justify-center !w-auto mx-4 my-[50%] p-4 gap-4"
-      onClose={(e) => {
-        e.stopPropagation();
-        onClose();
-      }}
-    >
-      <ModalContent className="flex flex-col w-full gap-4 items-center text-base justify-center">
-        {!request.cid ? (
-          <p className="text-slate-500 text-center">
-            {uploadError ||
-              'This will make your proof publicly accessible by anyone with the CID'}
-          </p>
-        ) : (
-          <input
-            className="input w-full bg-slate-100 border border-slate-200"
-            readOnly
-            value={`${EXPLORER_API}/ipfs/${request.cid}`}
-            onFocus={(e) => e.target.select()}
-          />
-        )}
-      </ModalContent>
-      <div className="flex flex-row gap-2 justify-center">
-        {!request.cid ? (
-          <>
-            {!uploadError && (
-              <button
-                onClick={handleUpload}
-                className="button button--primary flex flex-row items-center justify-center gap-2 m-0"
-                disabled={uploading}
-              >
-                {uploading && (
-                  <Icon
-                    className="animate-spin"
-                    fa="fa-solid fa-spinner"
-                    size={1}
-                  />
-                )}
-                I understand
-              </button>
-            )}
-            <button
-              className="m-0 w-24 bg-slate-100 text-slate-400 hover:bg-slate-200 hover:text-slate-600 font-bold"
-              onClick={onClose}
-            >
-              Close
-            </button>
-          </>
-        ) : (
-          <>
-            <button
-              onClick={() => copy(`${EXPLORER_API}/ipfs/${request.cid}`)}
-              className="m-0 w-24 bg-slate-600 text-slate-200 hover:bg-slate-500 hover:text-slate-100 font-bold"
-            >
-              Copy
-            </button>
-            <button
-              className="m-0 w-24 bg-slate-100 text-slate-400 hover:bg-slate-200 hover:text-slate-600 font-bold"
-              onClick={onClose}
-            >
-              Close
-            </button>
-          </>
-        )}
-      </div>
-    </Modal>
-  );
-}
-
-export function RemoveHistory(props: {
-  onRemove: () => void;
-  showRemovalModal: boolean;
-  setShowRemoveModal: (show: boolean) => void;
-  onCancel: () => void;
-}): ReactElement {
-  const { onRemove, setShowRemoveModal, showRemovalModal } = props;
-
-  const onCancel = useCallback(() => {
-    setShowRemoveModal(false);
-  }, [showRemovalModal]);
-  return !showRemovalModal ? (
-    <></>
-  ) : (
-    <Modal
-      onClose={onCancel}
-      className="flex flex-col items-center text-base cursor-default justify-center !w-auto mx-4 my-[50%] p-4 gap-4"
-    >
-      <ModalContent className="flex flex-col w-full gap-4 items-center text-base justify-center">
-        <div className="text-base">
-          Are you sure you want to delete this attestation?
-        </div>
-        <div className="mb-1">
-          <span className="text-red-500 font-bold">Warning:</span> this cannot
-          be undone.
-        </div>
-        <div className="flex flex-row gap-2 justify-end">
-          <button
-            className="m-0 w-24 bg-slate-100 text-slate-300 hover:bg-slate-200 hover:text-slate-500"
-            onClick={onCancel}
-          >
-            Cancel
-          </button>
-          <button
-            className="m-0 w-24 bg-red-100 text-red-300 hover:bg-red-200 hover:text-red-500"
-            onClick={onRemove}
-          >
-            Delete
-          </button>
-        </div>
-      </ModalContent>
-    </Modal>
-  );
-}

src/pages/Home/index.scss

@@ -1,5 +0,0 @@
-#home {
-  &::-webkit-scrollbar {
-    display: none;
-  }
-}

src/pages/Home/index.tsx

@@ -1,124 +1,104 @@
 import React, {
+  ChangeEvent,
   MouseEventHandler,
   ReactElement,
-  useEffect,
-  useRef,
+  ReactNode,
+  useCallback,
   useState,
 } from 'react';
+import Icon from '../../components/Icon';
 import classNames from 'classnames';
-import { ErrorModal } from '../../components/ErrorModal';
-import History from '../History';
-import './index.scss';
-import Requests from '../Requests';
-import { fetchPluginHashes } from '../../utils/rpc';
+import { useNavigate } from 'react-router';
+import { useRequests } from '../../reducers/requests';
+import { makePlugin, getPluginConfig } from '../../utils/misc';
+import { addPlugin } from '../../utils/rpc';
 import { PluginList } from '../../components/PluginList';
-import { getDeveloperMode } from '../../utils/storage';
+import { ErrorModal } from '../../components/ErrorModal';
 
-export default function Home(props: {
-  tab?: 'history' | 'network';
-}): ReactElement {
+export default function Home(): ReactElement {
+  const requests = useRequests();
+  const navigate = useNavigate();
   const [error, showError] = useState('');
-  const [tab, setTab] = useState<'history' | 'network' | 'plugins'>(
-    props.tab || 'history',
-  );
-  const scrollableContent = useRef<HTMLDivElement | null>(null);
-  const [shouldFix, setFix] = useState(false);
-  const [developerMode, setDeveloperMode] = useState(false);
 
-  useEffect(() => {
-    fetchPluginHashes();
-    getDeveloperMode().then(setDeveloperMode);
-  }, []);
-
-  useEffect(() => {
-    const element = scrollableContent.current;
-    if (!element) return;
-
-    const onScroll = () => {
-      if (element.scrollTop > 0) {
-        setFix(true);
-      } else {
-        setFix(false);
+  const onAddPlugin = useCallback(
+    async (evt: ChangeEvent<HTMLInputElement>) => {
+      if (!evt.target.files) return;
+      try {
+        const [file] = evt.target.files;
+        const arrayBuffer = await file.arrayBuffer();
+        const plugin = await makePlugin(arrayBuffer);
+        await getPluginConfig(plugin);
+        await addPlugin(Buffer.from(arrayBuffer).toString('hex'));
+      } catch (e: any) {
+        showError(e?.message || 'Invalid Plugin');
       }
-    };
-
-    element.addEventListener('scroll', onScroll);
-
-    return () => {
-      element.removeEventListener('scroll', onScroll);
-    };
-  }, [scrollableContent]);
+    },
+    [],
+  );
 
   return (
-    <div
-      id="home"
-      ref={scrollableContent}
-      className="flex flex-col flex-grow overflow-y-auto"
-    >
+    <div className="flex flex-col gap-4 py-4 overflow-y-auto">
       {error && <ErrorModal onClose={() => showError('')} message={error} />}
-      <div
-        className={classNames(
-          'flex flex-row justify-center items-center z-10',
-          {
-            'fixed top-9 w-full bg-white shadow lg:w-[598px] lg:mt-40':
-              shouldFix,
-          },
-        )}
-      >
-        <TabSelector
-          onClick={() => setTab('network')}
-          selected={tab === 'network'}
-        >
-          Network
-        </TabSelector>
-        <TabSelector
-          onClick={() => setTab('history')}
-          selected={tab === 'history'}
+      <div className="flex flex-col flex-nowrap justify-center gap-2 mx-4">
+        <NavButton fa="fa-solid fa-table" onClick={() => navigate('/requests')}>
+          <span>Requests</span>
+          <span>{`(${requests.length})`}</span>
+        </NavButton>
+        <NavButton fa="fa-solid fa-hammer" onClick={() => navigate('/custom')}>
+          Custom
+        </NavButton>
+        <NavButton
+          fa="fa-solid fa-certificate"
+          onClick={() => navigate('/verify')}
         >
+          Verify
+        </NavButton>
+        <NavButton fa="fa-solid fa-list" onClick={() => navigate('/history')}>
           History
-        </TabSelector>
-        {developerMode && (
-          <TabSelector
-            onClick={() => setTab('plugins')}
-            selected={tab === 'plugins'}
-          >
-            Plugins
-          </TabSelector>
-        )}
-      </div>
-      <div className="flex-grow">
-        {tab === 'history' && <History />}
-        {tab === 'network' && <Requests shouldFix={shouldFix} />}
-        {tab === 'plugins' && (
-          <PluginList
-            className="p-2 overflow-y-auto"
-            showAddButton={developerMode}
+        </NavButton>
+        <NavButton className="relative" fa="fa-solid fa-plus">
+          <input
+            className="opacity-0 absolute top-0 right-0 h-full w-full"
+            type="file"
+            onChange={onAddPlugin}
           />
-        )}
+          Add a plugin
+        </NavButton>
+        <NavButton fa="fa-solid fa-gear" onClick={() => navigate('/options')}>
+          Options
+        </NavButton>
       </div>
+      <PluginList className="mx-4" />
     </div>
   );
 }
 
-function TabSelector(props: {
-  children: string;
+function NavButton(props: {
+  fa: string;
+  children?: ReactNode;
+  onClick?: MouseEventHandler;
   className?: string;
-  selected?: boolean;
-  onClick: MouseEventHandler;
+  disabled?: boolean;
 }): ReactElement {
   return (
     <button
-      onClick={props.onClick}
       className={classNames(
-        'flex flex-grow items-center justify-center p-2 font-semibold hover:text-slate-700 border-b-2 ',
+        'flex flex-row flex-nowrap items-center justify-center',
+        'text-white rounded px-2 py-1 gap-1',
         {
-          'font-semibold text-slate-400 border-white': !props.selected,
-          'font-bold text-primary border-primary': props.selected,
+          'bg-primary/[.8] hover:bg-primary/[.7] active:bg-primary':
+            !props.disabled,
+          'bg-primary/[.5]': props.disabled,
         },
         props.className,
       )}
+      onClick={props.onClick}
+      disabled={props.disabled}
     >
-      {props.children}
+      <Icon className="flex-grow-0 flex-shrink-0" fa={props.fa} size={1} />
+      <span className="flex-grow flex-shrink w-0 flex-grow font-bold">
+        {props.children}
+      </span>
     </button>
   );
 }

src/pages/Notarize/index.tsx

@@ -1,18 +1,21 @@
 import classNames from 'classnames';
 import React, {
+  ReactNode,
   ReactElement,
   useState,
   useCallback,
   ReactEventHandler,
   useEffect,
   useRef,
-  useMemo,
 } from 'react';
-import { useNavigate, useParams } from 'react-router';
+import { useLocation, useNavigate, useParams } from 'react-router';
 import { notarizeRequest, useRequest } from '../../reducers/requests';
 import Icon from '../../components/Icon';
 import { urlify } from '../../utils/misc';
 import {
+  get,
+  NOTARY_API_LS_KEY,
+  PROXY_API_LS_KEY,
   getNotaryApi,
   getProxyApi,
   getMaxSent,
@@ -20,6 +23,8 @@ import {
 } from '../../utils/storage';
 import { useDispatch } from 'react-redux';
 
+const maxTranscriptSize = 16384;
+
 export default function Notarize(): ReactElement {
   const params = useParams<{ requestId: string }>();
   const req = useRequest(params.requestId);
@@ -47,7 +52,9 @@ export default function Notarize(): ReactElement {
     //TODO: for some reason, these needs to be override to work
     headers['Accept-Encoding'] = 'identity';
     headers['Connection'] = 'close';
-
+    if (req.requestBody) {
+      headers['Content-Length'] = req.requestBody.length.toString();
+    }
     dispatch(
       // @ts-ignore
       notarizeRequest({
@@ -57,6 +64,7 @@ export default function Notarize(): ReactElement {
         body: req.requestBody,
         maxSentData,
         maxRecvData,
+        maxTranscriptSize,
         notaryUrl,
         websocketProxyUrl,
         secretHeaders,
@@ -119,7 +127,7 @@ export default function Notarize(): ReactElement {
   );
 }
 
-export function RevealHeaderStep(props: {
+function RevealHeaderStep(props: {
   onNext: () => void;
   onCancel: () => void;
   setSecretHeaders: (secrets: string[]) => void;
@@ -128,8 +136,6 @@ export function RevealHeaderStep(props: {
   const req = useRequest(params.requestId);
   const [revealed, setRevealed] = useState<{ [key: string]: boolean }>({});
 
-  const headers = req?.requestHeaders;
-
   useEffect(() => {
     if (!req) return;
 
@@ -157,21 +163,21 @@ export function RevealHeaderStep(props: {
     [revealed, req],
   );
 
-  if (!headers) return <></>;
+  if (!req) return <></>;
 
   return (
     <div className="flex flex-col flex-nowrap flex-shrink flex-grow h-0">
       <div className="border bg-primary/[0.9] text-white border-slate-300 py-1 px-2 font-semibold">
-        `Step 1 of 2: Select which request headers you want to reveal`
+        Step 1 of 2: Select which request headers you want to reveal
       </div>
       <div className="flex-grow flex-shrink h-0 overflow-y-auto">
         <table className="border border-slate-300 border-collapse table-fixed">
           <tbody className="bg-slate-200">
-            {headers.map((h) => (
+            {req.requestHeaders?.map((h) => (
               <tr
                 key={h.name}
                 className={classNames('border-b border-slate-200 text-xs', {
-                  'bg-slate-50': revealed[h.name],
+                  'bg-slate-50': !!revealed[h.name],
                 })}
               >
                 <td className="border border-slate-300 py-1 px-2 align-top">
@@ -179,14 +185,14 @@ export function RevealHeaderStep(props: {
                     type="checkbox"
                     className="cursor-pointer"
                     onChange={(e) => changeHeaderKey(h.name, e.target.checked)}
-                    checked={revealed[h.name]}
+                    checked={!!revealed[h.name]}
                   />
                 </td>
                 <td className="border border-slate-300 font-bold align-top py-1 px-2 whitespace-nowrap">
                   {h.name}
                 </td>
                 <td className="border border-slate-300 break-all align-top py-1 px-2">
-                  {revealed[h.name]
+                  {!!revealed[h.name]
                     ? h.value
                     : Array(h.value?.length || 0)
                         .fill('*')
@@ -212,146 +218,34 @@ export function RevealHeaderStep(props: {
   );
 }
 
-export function RevealHeaderTable(props: {
-  headers: { name: string; value: string }[];
-  className?: string;
-  onChange: (revealed: { [key: string]: boolean }) => void;
-}) {
-  const { headers } = props;
-  const [revealed, setRevealed] = useState<{ [key: string]: boolean }>({});
-
-  const changeHeaderKey = useCallback(
-    (key: string, shouldReveal: boolean) => {
-      const result = {
-        ...revealed,
-        [key]: shouldReveal,
-      };
-      setRevealed(result);
-      props.onChange(result);
-    },
-    [revealed],
-  );
-
-  return (
-    <table
-      className={classNames(
-        'border border-slate-300 border-collapse table-fixed',
-        props.className,
-      )}
-    >
-      <thead className="bg-slate-200">
-        <th className="border border-slate-300 py-1 px-2 align-middle w-8"></th>
-        <th className="border border-slate-300 py-1 px-2 align-middle">Name</th>
-        <th className="border border-slate-300 py-1 px-2 align-middle">
-          Value
-        </th>
-      </thead>
-      <tbody className="bg-slate-100">
-        {headers.map((h) => (
-          <tr
-            key={h.name}
-            className={classNames('border-b border-slate-200 text-xs', {
-              'bg-slate-50': revealed[h.name],
-            })}
-          >
-            <td className="border border-slate-300 py-1 px-2 align-top w-8">
-              <input
-                type="checkbox"
-                className="cursor-pointer"
-                onChange={(e) => changeHeaderKey(h.name, e.target.checked)}
-                checked={revealed[h.name]}
-              />
-            </td>
-            <td className="border border-slate-300 font-bold align-top py-1 px-2 whitespace-nowrap">
-              {h.name}
-            </td>
-            <td className="border border-slate-300 break-all align-top py-1 px-2">
-              {revealed[h.name]
-                ? h.value
-                : Array(h.value?.length || 0)
-                    .fill('*')
-                    .join('')}
-            </td>
-          </tr>
-        ))}
-      </tbody>
-    </table>
-  );
-}
-
-export function HideResponseStep(props: {
+function HideResponseStep(props: {
   onNext: () => void;
   onCancel: () => void;
   setSecretResps: (secrets: string[]) => void;
-}): React.ReactElement {
+}): ReactElement {
   const params = useParams<{ requestId: string }>();
   const req = useRequest(params.requestId);
   const [responseText, setResponseText] = useState('');
-  const [redactedRanges, setRedactedRanges] = useState<
-    { start: number; end: number }[]
-  >([]);
-  const [isRedactMode, setIsRedactMode] = useState(true);
+  const [start, setStart] = useState(0);
+  const [end, setEnd] = useState(0);
   const taRef = useRef<HTMLTextAreaElement | null>(null);
 
-  const onSelectionChange: React.MouseEventHandler<HTMLTextAreaElement> =
-    useCallback(
-      (e) => {
-        const ta = e.currentTarget;
-        if (isRedactMode && ta.selectionEnd > ta.selectionStart) {
-          const newRange: { start: number; end: number } = {
-            start: ta.selectionStart,
-            end: ta.selectionEnd,
-          };
-
-          setRedactedRanges((prevRanges) => {
-            let updatedRanges = [...prevRanges, newRange].sort(
-              (a, b) => a.start - b.start,
-            );
-            updatedRanges = mergeRanges(updatedRanges);
-
-            const secretResps = updatedRanges
-              .map(({ start, end }) => responseText.substring(start, end))
-              .filter((d) => !!d);
-            props.setSecretResps(secretResps);
-
-            return updatedRanges;
-          });
-        } else if (!isRedactMode) {
-          const clickPosition = ta.selectionStart;
-          setRedactedRanges((prevRanges) => {
-            const updatedRanges = prevRanges.filter(
-              ({ start, end }) => clickPosition < start || clickPosition > end,
-            );
-
-            const secretResps = updatedRanges
-              .map(({ start, end }) => responseText.substring(start, end))
-              .filter((d) => !!d);
-            props.setSecretResps(secretResps);
-
-            return updatedRanges;
-          });
-        }
-      },
-      [responseText, props, isRedactMode],
-    );
-
-  const mergeRanges = (
-    ranges: { start: number; end: number }[],
-  ): { start: number; end: number }[] => {
-    if (ranges.length === 0) return [];
-    const mergedRanges: { start: number; end: number }[] = [ranges[0]];
-
-    for (let i = 1; i < ranges.length; i++) {
-      const lastRange = mergedRanges[mergedRanges.length - 1];
-      if (ranges[i].start <= lastRange.end) {
-        lastRange.end = Math.max(lastRange.end, ranges[i].end);
-      } else {
-        mergedRanges.push(ranges[i]);
+  const onSelectionChange: ReactEventHandler<HTMLTextAreaElement> = useCallback(
+    (e) => {
+      const ta = e.currentTarget;
+      if (ta.selectionEnd > ta.selectionStart) {
+        setStart(ta.selectionStart);
+        setEnd(ta.selectionEnd);
+        props.setSecretResps(
+          [
+            responseText.substring(0, ta.selectionStart),
+            responseText.substring(ta.selectionEnd, responseText.length),
+          ].filter((d) => !!d),
+        );
       }
-    }
-
-    return mergedRanges;
-  };
+    },
+    [responseText],
+  );
 
   useEffect(() => {
     if (!req) return;
@@ -382,126 +276,6 @@ export function HideResponseStep(props: {
     replay(req.url, options).then((resp) => setResponseText(resp));
   }, [req]);
 
-  useEffect(() => {
-    const current = taRef.current;
-
-    if (current) {
-      current.focus();
-    }
-  }, [taRef]);
-
-  if (!req) return <></>;
-
-  const shieldedText = responseText.split('');
-  redactedRanges.forEach(({ start, end }) => {
-    for (let i = start; i < end; i++) {
-      shieldedText[i] = '*';
-    }
-  });
-
-  return (
-    <div className="flex flex-col flex-nowrap flex-shrink flex-grow h-0">
-      <div className="border bg-primary/[0.9] text-white border-slate-300 py-1 px-2 font-semibold">
-        Step 2 of 2:{' '}
-        {isRedactMode
-          ? 'Highlight text to redact selected portions'
-          : 'Click redacted text to unredact'}
-      </div>
-      <div className="flex flex-row justify-end p-0.5 gap-2 border-t">
-        <button
-          className={`bg-${isRedactMode ? 'red-500' : 'green-500'} text-white font-bold hover:bg-${isRedactMode ? 'red-400' : 'green-400'} px-2 py-0.5 active:bg-${isRedactMode ? 'red-600' : 'green-600'}`}
-          onClick={() => setIsRedactMode(!isRedactMode)}
-        >
-          {isRedactMode ? 'Unredact Text' : 'Redact Text'}
-        </button>
-        <button
-          className="bg-gray-500 text-white font-bold hover:bg-gray-400 px-2 py-0.5 active:bg-gray-600"
-          onClick={() => setRedactedRanges([])}
-        >
-          Unredact All
-        </button>
-      </div>
-      <div className="flex flex-col flex-grow flex-shrink h-0 overflow-y-auto p-2">
-        <textarea
-          ref={taRef}
-          className="flex-grow textarea bg-slate-100 font-mono"
-          value={shieldedText.join('')}
-          onMouseUp={onSelectionChange}
-        />
-      </div>
-      <div className="flex flex-row justify-end p-2 gap-2 border-t">
-        <button className="button" onClick={props.onCancel}>
-          Back
-        </button>
-        <button
-          className="bg-primary/[0.9] text-white font-bold hover:bg-primary/[0.8] px-2 py-0.5 active:bg-primary"
-          onClick={props.onNext}
-        >
-          Notarize
-        </button>
-      </div>
-    </div>
-  );
-}
-
-export function RedactBodyTextarea(props: {
-  className?: string;
-  onChange: (secretResponse: string[]) => void;
-  request: {
-    url: string;
-    method?: string;
-    headers?: { [name: string]: string };
-    formData?: { [k: string]: string[] };
-    body?: string;
-  };
-}) {
-  const { className, onChange, request } = props;
-
-  const [loading, setLoading] = useState(false);
-  const [responseText, setResponseText] = useState('');
-  const [start, setStart] = useState(0);
-  const [end, setEnd] = useState(0);
-  const taRef = useRef<HTMLTextAreaElement | null>(null);
-
-  const onSelectionChange: ReactEventHandler<HTMLTextAreaElement> = useCallback(
-    (e) => {
-      const ta = e.currentTarget;
-      if (ta.selectionEnd > ta.selectionStart) {
-        setStart(ta.selectionStart);
-        setEnd(ta.selectionEnd);
-        onChange(
-          [
-            responseText.substring(0, ta.selectionStart),
-            responseText.substring(ta.selectionEnd, responseText.length),
-          ].filter((d) => !!d),
-        );
-      }
-    },
-    [responseText],
-  );
-
-  useEffect(() => {
-    const options = {
-      method: request.method,
-      headers: request.headers,
-      body: request.body,
-    };
-
-    if (request?.formData) {
-      const formData = new URLSearchParams();
-      Object.entries(request.formData).forEach(([key, values]) => {
-        values.forEach((v) => formData.append(key, v));
-      });
-      options.body = formData.toString();
-    }
-
-    setLoading(true);
-    replay(request.url, options).then((resp) => {
-      setResponseText(resp);
-      setLoading(false);
-    });
-  }, [request]);
-
   useEffect(() => {
     const current = taRef.current;
 
@@ -511,6 +285,8 @@ export function RedactBodyTextarea(props: {
     }
   }, [taRef, start, end]);
 
+  if (!req) return <></>;
+
   let shieldedText = '';
 
   if (end > start) {
@@ -524,29 +300,31 @@ export function RedactBodyTextarea(props: {
           .join(''),
       );
   }
-
-  if (loading) {
-    return (
-      <div className="flex flex-col items-center !pt-4 flex-grow textarea bg-slate-100">
-        <Icon
-          className="animate-spin w-fit text-slate-500"
-          fa="fa-solid fa-spinner"
-          size={1}
+  return (
+    <div className="flex flex-col flex-nowrap flex-shrink flex-grow h-0">
+      <div className="border bg-primary/[0.9] text-white border-slate-300 py-1 px-2 font-semibold">
+        Step 2 of 2: Highlight text to show only selected text from response
+      </div>
+      <div className="flex flex-col flex-grow flex-shrink h-0 overflow-y-auto p-2">
+        <textarea
+          ref={taRef}
+          className="flex-grow textarea bg-slate-100 font-mono"
+          value={shieldedText || responseText}
+          onSelect={onSelectionChange}
         />
       </div>
-    );
-  }
-
-  return (
-    <textarea
-      ref={taRef}
-      className={classNames(
-        'flex-grow textarea bg-slate-100 font-mono',
-        className,
-      )}
-      value={shieldedText || responseText}
-      onSelect={onSelectionChange}
-    />
+      <div className="flex flex-row justify-end p-2 gap-2 border-t">
+        <button className="button" onClick={props.onCancel}>
+          Back
+        </button>
+        <button
+          className="bg-primary/[0.9] text-white font-bold hover:bg-primary/[0.8] px-2 py-0.5 active:bg-primary"
+          onClick={props.onNext}
+        >
+          Notarize
+        </button>
+      </div>
+    </div>
   );
 }
 

src/pages/NotarizeApproval/index.tsx

@@ -1,178 +0,0 @@
-import React, { ReactElement, useCallback, useState } from 'react';
-import Icon from '../../components/Icon';
-import { useSearchParams } from 'react-router-dom';
-import { urlify } from '../../utils/misc';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-import { BaseApproval } from '../BaseApproval';
-import { RedactBodyTextarea, RevealHeaderTable } from '../Notarize';
-
-export function NotarizeApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const config = JSON.parse(params.get('config')!);
-  const hostname = urlify(origin || '')?.hostname;
-  const [step, setStep] = useState<'overview' | 'headers' | 'response'>(
-    'overview',
-  );
-  const [revealed, setRevealed] = useState<{ [key: string]: boolean }>({});
-  const [secretResps, setSecretResps] = useState<string[]>([]);
-
-  const headerList = Object.entries(config.headers || {}).map(
-    ([name, value]) => ({
-      name,
-      value: String(value),
-    }),
-  );
-
-  const onCancel = useCallback(() => {
-    if (step === 'headers') return setStep('overview');
-    if (step === 'response') return setStep('headers');
-
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.notarize_response,
-      data: false,
-    });
-  }, [step]);
-
-  const onAccept = useCallback(() => {
-    if (step === 'overview') return setStep('headers');
-    if (step === 'headers') return setStep('response');
-
-    const secretHeaders = headerList
-      .map((h) => {
-        if (!revealed[h.name]) {
-          return `${h.name.toLowerCase()}: ${h.value || ''}` || '';
-        }
-        return '';
-      })
-      .filter((d) => !!d);
-
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.notarize_response,
-      data: {
-        ...config,
-        secretHeaders,
-        secretResps,
-      },
-    });
-  }, [revealed, step, secretResps, config]);
-
-  let body, headerText, primaryCta, secondaryCta;
-
-  switch (step) {
-    case 'overview':
-      headerText = 'Notarizing Request';
-      primaryCta = 'Next';
-      secondaryCta = 'Cancel';
-      body = (
-        <>
-          <div className="flex flex-col items-center gap-2 py-8">
-            {!!favIconUrl ? (
-              <img
-                src={favIconUrl}
-                className="h-16 w-16 rounded-full border border-slate-200 bg-slate-200"
-                alt="logo"
-              />
-            ) : (
-              <Icon
-                fa="fa-solid fa-globe"
-                size={4}
-                className="h-16 w-16 rounded-full border border-slate-200 text-blue-500"
-              />
-            )}
-            <div className="text-2xl text-center px-8">
-              <b className="text-blue-500">{hostname}</b> wants to notarize the
-              following request:
-            </div>
-          </div>
-          <div className="flex flex-col items-center gap-4 text-sm px-8 text-center flex-grow break-all">
-            <table className="border border-collapse table-auto rounded text-xs w-full">
-              <tbody>
-                <TableRow label="Method" value={config.method?.toUpperCase()} />
-                <TableRow label="Request URL" value={config.url} />
-                <TableRow label="Notary URL" value={config.notaryUrl} />
-                <TableRow label="Proxy URL" value={config.websocketProxyUrl} />
-                <TableRow label="Max Sent" value={config.maxSentData} />
-                <TableRow label="Max Recv" value={config.maxRecvData} />
-                {config.metadata && (
-                  <TableRow
-                    label="Metadata"
-                    value={JSON.stringify(config.metadata)}
-                  />
-                )}
-              </tbody>
-            </table>
-          </div>
-          <div className="text-xs px-8 pb-2 text-center text-slate-500">
-            You will be able to review and redact headers and response body.
-          </div>
-        </>
-      );
-      break;
-    case 'headers':
-      headerText = 'Step 1 of 2: Select headers to reveal';
-      primaryCta = 'Next';
-      secondaryCta = 'Back';
-      body = (
-        <div className="px-2 flex flex-col">
-          <RevealHeaderTable
-            className="w-full"
-            onChange={setRevealed}
-            headers={headerList}
-          />
-        </div>
-      );
-      break;
-    case 'response':
-      headerText = 'Step 2 of 2: Highlight response to keep';
-      primaryCta = 'Notarize';
-      secondaryCta = 'Back';
-      body = (
-        <div className="px-2 flex flex-col flex-grow">
-          <RedactBodyTextarea
-            className="w-full "
-            onChange={setSecretResps}
-            request={{
-              url: config.url,
-              method: config.method,
-              headers: config.headers,
-              body: config.body,
-              formData: config.formData,
-            }}
-          />
-        </div>
-      );
-      break;
-  }
-
-  return (
-    <BaseApproval
-      header={headerText}
-      onSecondaryClick={onCancel}
-      onPrimaryClick={onAccept}
-      primaryCTAText={primaryCta}
-      secondaryCTAText={secondaryCta}
-    >
-      {body}
-    </BaseApproval>
-  );
-}
-
-function TableRow({ label, value }: { label: string; value: string }) {
-  return (
-    <tr>
-      <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top text-left w-24">
-        {label}
-      </td>
-      <td className="px-2 py-1 border border-slate-300 font-semibold text-slate-800 text-left">
-        <input
-          className="outline-0 flex-grow cursor-default w-full"
-          type="text"
-          value={value}
-        />
-      </td>
-    </tr>
-  );
-}

src/pages/Options/index.tsx

@@ -17,10 +17,6 @@ import {
   getProxyApi,
   getLoggingFilter,
   LOGGING_FILTER_KEY,
-  getRendezvousApi,
-  RENDEZVOUS_API_LS_KEY,
-  getDeveloperMode,
-  DEVELOPER_MODE_LS_KEY,
 } from '../../utils/storage';
 import {
   EXPLORER_API,
@@ -28,52 +24,33 @@ import {
   NOTARY_PROXY,
   MAX_RECV,
   MAX_SENT,
-  RENDEZVOUS_API,
+  LOGGING_LEVEL_INFO,
+  LOGGING_LEVEL_NONE,
+  LOGGING_LEVEL_DEBUG,
+  LOGGING_LEVEL_TRACE,
 } from '../../utils/constants';
 import Modal, { ModalContent } from '../../components/Modal/Modal';
 import browser from 'webextension-polyfill';
-import { LoggingLevel } from 'tlsn-js';
-import { version } from '../../../package.json';
-import { getDBSize, resetDB } from '../../entries/Background/db';
 
 export default function Options(): ReactElement {
   const [notary, setNotary] = useState(NOTARY_API);
   const [proxy, setProxy] = useState(NOTARY_PROXY);
   const [maxSent, setMaxSent] = useState(MAX_SENT);
   const [maxReceived, setMaxReceived] = useState(MAX_RECV);
-  const [loggingLevel, setLoggingLevel] = useState<LoggingLevel>('Info');
-  const [rendezvous, setRendezvous] = useState(RENDEZVOUS_API);
-  const [developerMode, setDeveloperMode] = useState(false);
+  const [loggingLevel, setLoggingLevel] = useState(LOGGING_LEVEL_INFO);
 
   const [dirty, setDirty] = useState(false);
   const [shouldReload, setShouldReload] = useState(false);
   const [advanced, setAdvanced] = useState(false);
   const [showReloadModal, setShowReloadModal] = useState(false);
-  const [dbSize, setDbSize] = useState(0);
-  const [isCalculatingDbSize, setIsCalculatingDbSize] = useState(false);
-
-  useEffect(() => {
-    (async () => {
-      setIsCalculatingDbSize(true);
-      setDbSize(await getDBSize());
-      setIsCalculatingDbSize(false);
-    })();
-  }, []);
-
-  useEffect(() => {
-    (async () => {
-      setNotary(await getNotaryApi());
-      setProxy(await getProxyApi());
-      setDeveloperMode(await getDeveloperMode());
-    })();
-  }, []);
 
   useEffect(() => {
     (async () => {
+      setNotary((await getNotaryApi()) || NOTARY_API);
+      setProxy((await getProxyApi()) || NOTARY_PROXY);
       setMaxReceived((await getMaxRecv()) || MAX_RECV);
       setMaxSent((await getMaxSent()) || MAX_SENT);
-      setLoggingLevel((await getLoggingFilter()) || 'Info');
-      setRendezvous((await getRendezvousApi()) || RENDEZVOUS_API);
+      setLoggingLevel((await getLoggingFilter()) || LOGGING_LEVEL_INFO);
     })();
   }, [advanced]);
 
@@ -88,20 +65,9 @@ export default function Options(): ReactElement {
       await set(MAX_SENT_LS_KEY, maxSent.toString());
       await set(MAX_RECEIVED_LS_KEY, maxReceived.toString());
       await set(LOGGING_FILTER_KEY, loggingLevel);
-      await set(RENDEZVOUS_API_LS_KEY, rendezvous);
-      await set(DEVELOPER_MODE_LS_KEY, developerMode.toString());
       setDirty(false);
     },
-    [
-      notary,
-      proxy,
-      maxSent,
-      maxReceived,
-      loggingLevel,
-      rendezvous,
-      developerMode,
-      shouldReload,
-    ],
+    [notary, proxy, maxSent, maxReceived, loggingLevel, shouldReload],
   );
 
   const onSaveAndReload = useCallback(
@@ -116,19 +82,8 @@ export default function Options(): ReactElement {
     setAdvanced(!advanced);
   }, [advanced]);
 
-  const openInTab = useCallback((url: string) => {
-    browser.tabs.create({ url });
-  }, []);
-
-  const onCleanCache = useCallback(async () => {
-    setIsCalculatingDbSize(true);
-    await resetDB();
-    setDbSize(await getDBSize());
-    setIsCalculatingDbSize(false);
-  }, []);
-
   return (
-    <div className="flex flex-col flex-nowrap flex-grow overflow-y-auto">
+    <div className="flex flex-col flex-nowrap flex-grow">
       {showReloadModal && (
         <Modal
           className="flex flex-col items-center text-base cursor-default justify-center !w-auto mx-4 my-[50%] p-4 gap-4"
@@ -163,8 +118,6 @@ export default function Options(): ReactElement {
         proxy={proxy}
         setProxy={setProxy}
         setDirty={setDirty}
-        developerMode={developerMode}
-        setDeveloperMode={setDeveloperMode}
       />
       <div className="justify-left px-2 pt-3 gap-2">
         <button className="font-bold" onClick={onAdvanced}>
@@ -190,8 +143,6 @@ export default function Options(): ReactElement {
           loggingLevel={loggingLevel}
           setLoggingLevel={setLoggingLevel}
           setShouldReload={setShouldReload}
-          rendezvous={rendezvous}
-          setRendezvous={setRendezvous}
         />
       )}
       <div className="flex flex-row flex-nowrap justify-end gap-2 p-2">
@@ -203,31 +154,6 @@ export default function Options(): ReactElement {
           Save
         </button>
       </div>
-      <div className="flex flex-col w-full items-end gap-2 p-2">
-        <button
-          className="button"
-          onClick={() =>
-            openInTab('https://github.com/tlsnotary/tlsn-extension/issues/new')
-          }
-        >
-          File an issue
-        </button>
-        <button
-          className="button"
-          onClick={() => openInTab('https://discord.gg/9XwESXtcN7')}
-        >
-          Join our Discord
-        </button>
-        <button className="button" onClick={onCleanCache}>
-          <span>Clean Cache (</span>
-          {isCalculatingDbSize ? (
-            <i className="fa-solid fa-spinner fa-spin"></i>
-          ) : (
-            <span>{(dbSize / 1024 / 1024).toFixed(2)} MB</span>
-          )}
-          <span>)</span>
-        </button>
-      </div>
     </div>
   );
 }
@@ -244,7 +170,7 @@ function InputField(props: {
 
   return (
     <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
-      <div className="font-semibold cursor-default">{label}</div>
+      <div className="font-semibold">{label}</div>
       <input
         type={type}
         className="input border"
@@ -263,25 +189,11 @@ function NormalOptions(props: {
   proxy: string;
   setProxy: (value: string) => void;
   setDirty: (value: boolean) => void;
-  developerMode: boolean;
-  setDeveloperMode: (value: boolean) => void;
 }) {
-  const {
-    notary,
-    setNotary,
-    proxy,
-    setProxy,
-    setDirty,
-    developerMode,
-    setDeveloperMode,
-  } = props;
+  const { notary, setNotary, proxy, setProxy, setDirty } = props;
 
   return (
     <div>
-      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2 cursor-default">
-        <div className="font-semibold">Version</div>
-        <div className="input border bg-slate-100">{version}</div>
-      </div>
       <InputField
         label="Notary API"
         placeholder="https://api.tlsnotary.org"
@@ -302,36 +214,9 @@ function NormalOptions(props: {
           setDirty(true);
         }}
       />
-      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2 cursor-default">
+      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
         <div className="font-semibold">Explorer URL</div>
-        <div className="input border bg-slate-100">{EXPLORER_API}</div>
-      </div>
-      <div className="flex flex-row items-center py-3 px-2 gap-2">
-        <div className="font-semibold">Developer Mode</div>
-        <div className="relative inline-block w-9 h-5">
-          <input
-            type="checkbox"
-            id="developer-mode"
-            checked={developerMode}
-            onChange={(e) => {
-              setDeveloperMode(e.target.checked);
-              setDirty(true);
-            }}
-            className="sr-only"
-          />
-          <label
-            htmlFor="developer-mode"
-            className={`block h-5 rounded-full cursor-pointer transition-all duration-300 ease-in-out ${
-              developerMode ? 'bg-blue-500' : 'bg-gray-300'
-            }`}
-          >
-            <span
-              className={`absolute top-0.5 left-0.5 w-4 h-4 bg-white rounded-full shadow-sm transform transition-all duration-300 ease-in-out ${
-                developerMode ? 'translate-x-4' : 'translate-x-0'
-              }`}
-            />
-          </label>
-        </div>
+        <div className="input border">{EXPLORER_API}</div>
       </div>
     </div>
   );
@@ -340,14 +225,12 @@ function NormalOptions(props: {
 function AdvancedOptions(props: {
   maxSent: number;
   maxReceived: number;
-  loggingLevel: LoggingLevel;
-  rendezvous: string;
+  loggingLevel: string;
   setShouldReload: (reload: boolean) => void;
   setMaxSent: (value: number) => void;
   setMaxReceived: (value: number) => void;
   setDirty: (value: boolean) => void;
-  setLoggingLevel: (level: LoggingLevel) => void;
-  setRendezvous: (api: string) => void;
+  setLoggingLevel: (level: string) => void;
 }) {
   const {
     maxSent,
@@ -358,8 +241,6 @@ function AdvancedOptions(props: {
     setLoggingLevel,
     loggingLevel,
     setShouldReload,
-    rendezvous,
-    setRendezvous,
   } = props;
 
   return (
@@ -389,17 +270,16 @@ function AdvancedOptions(props: {
         <select
           className="select !bg-white border !px-2 !py-1"
           onChange={(e) => {
-            setLoggingLevel(e.target.value as LoggingLevel);
+            setLoggingLevel(e.target.value);
             setDirty(true);
             setShouldReload(true);
           }}
           value={loggingLevel}
         >
-          <option value="Error">Error</option>
-          <option value="Warn">Warn</option>
-          <option value="Info">Info</option>
-          <option value="Debug">Debug</option>
-          <option value="Trace">Trace</option>
+          <option value={LOGGING_LEVEL_NONE}>None</option>
+          <option value={LOGGING_LEVEL_INFO}>Info</option>
+          <option value={LOGGING_LEVEL_DEBUG}>Debug</option>
+          <option value={LOGGING_LEVEL_TRACE}>Trace</option>
         </select>
       </div>
       <div className="flex flex-row flex-nowrap justify-end gap-2 p-2"></div>

src/pages/PeerToPeer/index.tsx

@@ -1,497 +0,0 @@
-import React, {
-  ChangeEvent,
-  ReactElement,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
-import Icon from '../../components/Icon';
-import classNames from 'classnames';
-import {
-  connectRendezvous,
-  disconnectRendezvous,
-  fetchP2PState,
-  sendPairRequest,
-  useClientId,
-  useIncomingPairingRequests,
-  useOutgoingPairingRequests,
-  cancelPairRequest,
-  useP2PError,
-  setP2PError,
-  acceptPairRequest,
-  rejectPairRequest,
-  usePairId,
-  useIncomingProofRequests,
-  requestProofByHash,
-  useOutgoingProofRequests,
-  acceptProofRequest,
-  rejectProofRequest,
-  cancelProofRequest,
-  useP2PProving,
-  useP2PVerifying,
-  useP2PPresentation,
-} from '../../reducers/p2p';
-import { useDispatch } from 'react-redux';
-import Modal, { ModalHeader } from '../../components/Modal/Modal';
-import { Plugin, PluginList } from '../../components/PluginList';
-import browser from 'webextension-polyfill';
-import { sha256 } from '../../utils/misc';
-import { openSidePanel } from '../../entries/utils';
-import { SidePanelActionTypes } from '../../entries/SidePanel/types';
-import ProofViewer from '../ProofViewer';
-
-export function P2PHome(): ReactElement {
-  const clientId = useClientId();
-
-  useEffect(() => {
-    fetchP2PState();
-  }, []);
-
-  const toggleConnection = useCallback(async () => {
-    if (!clientId) {
-      connectRendezvous();
-    } else {
-      disconnectRendezvous();
-    }
-  }, [clientId]);
-
-  return (
-    <div className="flex flex-col h-full cursor-default gap-2 my-2">
-      <div className="flex flex-row border border-slate-300 rounded mx-2">
-        <div className="bg-slate-200 px-2 py-1 flex-grow-0 border-r border-slate-300">
-          Client ID
-        </div>
-        <input
-          className={classNames(
-            'flex-grow outline-0 px-2 py-1 cursor-default font-semibold',
-            {
-              'text-slate-400 bg-slate-100': !clientId,
-              'text-green-500 cursor-pointer': clientId,
-            },
-          )}
-          onClick={(e) => {
-            // @ts-ignore
-            if (e.target.select && clientId) e.target.select();
-          }}
-          value={clientId ? clientId : '--'}
-          readOnly
-        />
-        <button
-          className="flex-grow-0 px-2 py-1 button border-l border-slate-300"
-          onClick={toggleConnection}
-        >
-          {clientId ? 'Stop' : 'Start'}
-        </button>
-      </div>
-      <ClientStatus />
-      <div className="flex flex-row mx-2 flex-grow flex-shrink h-0 p-2">
-        <div className="text-slate-400 text-center w-full font-semibold">
-          No proofs history
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function ClientStatus() {
-  const clientId = useClientId();
-  const error = useP2PError();
-  const pairId = usePairId();
-  const [incomingPairingRequest] = useIncomingPairingRequests();
-  const [outgoingPairingRequest] = useOutgoingPairingRequests();
-
-  let body = null;
-
-  if (!clientId) {
-    body = <ClientNotStarted />;
-  } else if (pairId) {
-    body = <Paired />;
-  } else if (!incomingPairingRequest && !outgoingPairingRequest) {
-    body = <PendingConnection />;
-  } else if (incomingPairingRequest) {
-    body = <IncomingRequest />;
-  } else if (outgoingPairingRequest) {
-    body = <OutgoingRequest />;
-  }
-
-  return (
-    <div
-      className={classNames(
-        'flex flex-col items-center justify-center border border-slate-300',
-        'flex-grow-0 flex-shrink rounded mx-2 bg-slate-100 py-4 gap-4',
-      )}
-    >
-      {body}
-      {error && <span className="text-xs text-red-500">{error}</span>}
-    </div>
-  );
-}
-
-function Paired() {
-  const pairId = usePairId();
-  const clientId = useClientId();
-  const [incomingProofRequest] = useIncomingProofRequests();
-  const [outgoingPluginHash] = useOutgoingProofRequests();
-  const [incomingPluginHash, setIncomingPluginHash] = useState('');
-  const [showingModal, showModal] = useState(false);
-  const isProving = useP2PProving();
-  const isVerifying = useP2PVerifying();
-  const presentation = useP2PPresentation();
-
-  useEffect(() => {
-    (async () => {
-      if (!incomingProofRequest) {
-        setIncomingPluginHash('');
-        return;
-      }
-      const hash = await sha256(incomingProofRequest);
-      setIncomingPluginHash(hash);
-    })();
-  }, [incomingProofRequest]);
-
-  useEffect(() => {
-    showModal(false);
-  }, [outgoingPluginHash]);
-
-  const accept = useCallback(async () => {
-    if (incomingPluginHash) {
-      await openSidePanel();
-
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.run_p2p_plugin_request,
-        data: {
-          pluginHash: incomingPluginHash,
-          plugin: incomingProofRequest,
-        },
-      });
-
-      acceptProofRequest(incomingPluginHash);
-
-      window.close();
-    }
-  }, [incomingPluginHash, incomingProofRequest, clientId]);
-
-  const reject = useCallback(() => {
-    if (incomingPluginHash) rejectProofRequest(incomingPluginHash);
-  }, [incomingPluginHash]);
-
-  const cancel = useCallback(() => {
-    if (outgoingPluginHash) cancelProofRequest(outgoingPluginHash);
-  }, [outgoingPluginHash]);
-
-  let body;
-
-  if (incomingPluginHash) {
-    body = (
-      <IncomingProof
-        incomingProofRequest={incomingProofRequest}
-        incomingPluginHash={incomingPluginHash}
-        accept={accept}
-        reject={reject}
-        isProving={isProving}
-      />
-    );
-  } else if (outgoingPluginHash) {
-    body = (
-      <OutgoingProof
-        outgoingPluginHash={outgoingPluginHash}
-        cancel={cancel}
-        isVerifying={isVerifying}
-      />
-    );
-  } else {
-    body = (
-      <button
-        className="button button--primary"
-        onClick={() => showModal(true)}
-      >
-        Request Proof
-      </button>
-    );
-  }
-
-  return (
-    <div className="flex flex-col items-center gap-2 px-4 w-full">
-      {showingModal && <PluginListModal onClose={() => showModal(false)} />}
-      <div>
-        <span>Paired with </span>
-        <span className="font-semibold text-blue-500">{pairId}</span>
-      </div>
-      {body}
-    </div>
-  );
-}
-
-function IncomingProof({
-  incomingPluginHash,
-  incomingProofRequest,
-  reject,
-  accept,
-  isProving,
-}: {
-  incomingPluginHash: string;
-  incomingProofRequest: string;
-  reject: () => void;
-  accept: () => void;
-  isProving: boolean;
-}) {
-  const presentation = useP2PPresentation();
-  const [showingTranscript, showTranscript] = useState(false);
-
-  if (isProving) {
-    return (
-      <>
-        {presentation && showingTranscript && (
-          <Modal
-            className="h-full m-0 rounded-none"
-            onClose={() => showTranscript(false)}
-          >
-            <ProofViewer
-              className="h-full"
-              sent={presentation.sent}
-              recv={presentation.recv}
-            />
-          </Modal>
-        )}
-        <div className="font-semibold text-orange-500">
-          {presentation ? 'Proving Completed' : 'Proving to your peer...'}
-        </div>
-        <Plugin
-          className="w-full bg-white !cursor-default hover:!bg-white active:!bg-white hover:!border-slate-300"
-          hash={incomingPluginHash}
-          hex={incomingProofRequest}
-          onClick={() => null}
-          unremovable
-        />
-        <div className="flex flex-row gap-2">
-          <button
-            className="button button--primary"
-            onClick={() => showTranscript(true)}
-            disabled={!presentation}
-          >
-            View
-          </button>
-        </div>
-      </>
-    );
-  }
-
-  return (
-    <>
-      <div className="font-semibold text-orange-500">
-        Your peer is requesting the following proof:
-      </div>
-      <Plugin
-        className="w-full bg-white !cursor-default hover:!bg-white active:!bg-white hover:!border-slate-300"
-        hash={incomingPluginHash}
-        hex={incomingProofRequest}
-        onClick={() => null}
-        unremovable
-      />
-      <div className="flex flex-row gap-2">
-        <button className="button" onClick={reject}>
-          Decline
-        </button>
-        <button className="button button--primary" onClick={accept}>
-          Accept
-        </button>
-      </div>
-    </>
-  );
-}
-
-function OutgoingProof({
-  outgoingPluginHash,
-  cancel,
-  isVerifying,
-}: {
-  isVerifying: boolean;
-  outgoingPluginHash: string;
-  cancel: () => void;
-}) {
-  const presentation = useP2PPresentation();
-  const [showingTranscript, showTranscript] = useState(false);
-
-  if (isVerifying) {
-    return (
-      <>
-        {presentation && showingTranscript && (
-          <Modal
-            className="h-full m-0 rounded-none"
-            onClose={() => showTranscript(false)}
-          >
-            <ProofViewer
-              className="h-full"
-              sent={presentation.sent}
-              recv={presentation.recv}
-            />
-          </Modal>
-        )}
-        <div className="font-semibold text-orange-500">
-          {presentation
-            ? 'Verification Completed'
-            : 'Verifying with your peer...'}
-        </div>
-        <Plugin
-          className="w-full bg-white !cursor-default hover:!bg-white active:!bg-white hover:!border-slate-300"
-          hash={outgoingPluginHash}
-          onClick={() => null}
-          unremovable
-        />
-        <div className="flex flex-row gap-2">
-          <button
-            className="button button--primary"
-            onClick={() => showTranscript(true)}
-            disabled={!presentation}
-          >
-            View
-          </button>
-        </div>
-      </>
-    );
-  }
-
-  return (
-    <>
-      <div className="font-semibold text-orange-500">
-        Sent request for following proof:
-      </div>
-      <Plugin
-        className="w-full bg-white !cursor-default hover:!bg-white active:!bg-white hover:!border-slate-300"
-        hash={outgoingPluginHash}
-        onClick={() => null}
-        unremovable
-      />
-      <button className="button" onClick={cancel}>
-        Cancel
-      </button>
-    </>
-  );
-}
-
-function PluginListModal({ onClose }: { onClose: () => void }) {
-  const onRequestProof = useCallback(async (hash: string) => {
-    requestProofByHash(hash);
-  }, []);
-  return (
-    <Modal className="mx-4" onClose={onClose}>
-      <ModalHeader onClose={onClose}>Choose a plugin to continue</ModalHeader>
-      <PluginList className="m-2" onClick={onRequestProof} unremovable />
-    </Modal>
-  );
-}
-
-function IncomingRequest() {
-  const [incomingRequest] = useIncomingPairingRequests();
-
-  const accept = useCallback(() => {
-    if (incomingRequest) acceptPairRequest(incomingRequest);
-  }, [incomingRequest]);
-
-  const reject = useCallback(() => {
-    if (incomingRequest) rejectPairRequest(incomingRequest);
-  }, [incomingRequest]);
-
-  return (
-    <div className="flex flex-col items-center gap-2">
-      <div>
-        <span className="font-semibold text-blue-500">{incomingRequest}</span>
-        <span> wants to pair with you.</span>
-      </div>
-      <div className="flex flex-row gap-2">
-        <button className="button" onClick={reject}>
-          Decline
-        </button>
-        <button className="button button--primary" onClick={accept}>
-          Accept
-        </button>
-      </div>
-    </div>
-  );
-}
-
-function OutgoingRequest() {
-  const [outgoingRequest] = useOutgoingPairingRequests();
-
-  const cancel = useCallback(() => {
-    if (outgoingRequest) {
-      cancelPairRequest(outgoingRequest);
-    }
-  }, [outgoingRequest]);
-
-  return (
-    <div className="flex flex-col items-center gap-2">
-      <span className="flex flex-row items-center gap-2 mx-2">
-        <Icon
-          className="animate-spin w-fit text-slate-500"
-          fa="fa-solid fa-spinner"
-          size={1}
-        />
-        <span>
-          <span>Awaiting response from </span>
-          <span className="font-semibold text-blue-500">{outgoingRequest}</span>
-          <span>...</span>
-        </span>
-      </span>
-      <button className="button" onClick={cancel}>
-        Cancel
-      </button>
-    </div>
-  );
-}
-
-function ClientNotStarted() {
-  return (
-    <div className="flex flex-col text-slate-500 font-semibold gap-2">
-      Client has not started
-      <button className="button button--primary" onClick={connectRendezvous}>
-        Start Client
-      </button>
-    </div>
-  );
-}
-
-function PendingConnection() {
-  const dispatch = useDispatch();
-  const [target, setTarget] = useState('');
-
-  const onSend = useCallback(() => {
-    dispatch(setP2PError(''));
-    sendPairRequest(target);
-  }, [target]);
-
-  const onChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
-    dispatch(setP2PError(''));
-    setTarget(e.target.value);
-  }, []);
-
-  return (
-    <div className="flex flex-col w-full items-center gap-2">
-      <div className="flex flex-row justify-center gap-2">
-        <Icon
-          className="animate-spin w-fit text-slate-500"
-          fa="fa-solid fa-spinner"
-          size={1}
-        />
-        <div className="text-slate-500 font-semibold">
-          Waiting for pairing request...
-        </div>
-      </div>
-      <div className="text-slate-500">or</div>
-      <div className="w-full flex flex-row px-2 items-center">
-        <input
-          className="flex-grow flex-shrink w-0 outline-0 px-2 py-1 cursor-default"
-          placeholder="Enter Peer ID to send pairing request"
-          onChange={onChange}
-          value={target}
-        />
-        <button
-          className="button button--primary w-fit h-full"
-          onClick={onSend}
-        >
-          Send Pairing Request
-        </button>
-      </div>
-    </div>
-  );
-}

src/pages/Plugins/index.tsx

@@ -1,10 +0,0 @@
-import React, { ReactElement } from "react";
-import { PluginList } from "../../components/PluginList";
-
-export default function Plugins(): ReactElement {
-  return (
-    <div className="flex flex-col flex-nowrap flex-grow">
-      <PluginList className="p-2 overflow-y-auto" />
-    </div>
-  )
-}

src/pages/ProofUploader/index.tsx

@@ -7,17 +7,13 @@ import React, {
 import Icon from '../../components/Icon';
 import { BackgroundActiontype } from '../../entries/Background/rpc';
 import ProofViewer from '../ProofViewer';
-import { convertNotaryWsToHttp } from '../../utils/misc';
 
 export default function ProofUploader(): ReactElement {
   const [proof, setProof] = useState<{
     recv: string;
     sent: string;
-    verifierKey?: string;
-    notaryKey?: string;
   } | null>(null);
-  const [uploading, setUploading] = useState(false);
-  const [metadata, setMetaData] = useState<any>({ meta: '', version: '' });
+
   const onFileUpload: ChangeEventHandler<HTMLInputElement> = useCallback(
     async (e) => {
       // @ts-ignore
@@ -29,32 +25,16 @@ export default function ProofUploader(): ReactElement {
           const result = event.target?.result;
           if (result) {
             const proof = JSON.parse(result as string);
-            const notaryUrl = convertNotaryWsToHttp(proof.meta.notaryUrl);
-            proof.meta.notaryUrl = notaryUrl;
-            setMetaData({ meta: proof.meta, version: proof.version });
-            const res = await chrome.runtime
-              .sendMessage<
-                any,
-                {
-                  recv: string;
-                  sent: string;
-                  verifierKey?: string;
-                  notaryKey?: string;
-                }
-              >({
-                type: BackgroundActiontype.verify_proof,
-                data: proof,
-              })
-              .catch(() => null);
-
-            if (proof) {
-              setUploading(false);
-              setProof(res);
-            }
+            const res = await chrome.runtime.sendMessage<
+              any,
+              { recv: string; sent: string }
+            >({
+              type: BackgroundActiontype.verify_proof,
+              data: proof,
+            });
+            setProof(res);
           }
         });
-
-        setUploading(true);
         reader.readAsText(file);
       }
     },
@@ -62,15 +42,7 @@ export default function ProofUploader(): ReactElement {
   );
 
   if (proof) {
-    return (
-      <ProofViewer
-        recv={proof.recv}
-        sent={proof.sent}
-        verifierKey={proof.verifierKey}
-        notaryKey={proof.notaryKey}
-        info={metadata}
-      />
-    );
+    return <ProofViewer recv={proof.recv} sent={proof.sent} />;
   }
 
   return (
@@ -81,23 +53,16 @@ export default function ProofUploader(): ReactElement {
           className="absolute w-full h-full top-0 left-0 opacity-0 z-10"
           onChange={onFileUpload}
           accept=".json"
-          disabled={uploading}
         />
-        {uploading ? (
-          <Icon className="animate-spin" fa="fa-solid fa-spinner" size={2} />
-        ) : (
-          <>
-            <Icon className="mb-4" fa="fa-solid fa-upload" size={2} />
-            <div className="text-lg">Drop your proof here to continue</div>
-            <div className="text-sm">or</div>
-            <button
-              className="button !bg-primary/[.8] !hover:bg-primary/[.7] !active:bg-primary !text-white cursor-pointer"
-              onClick={() => null}
-            >
-              Browse Files
-            </button>
-          </>
-        )}
+        <Icon className="mb-4" fa="fa-solid fa-upload" size={2} />
+        <div className="text-lg">Drop your proof here to continue</div>
+        <div className="text-sm">or</div>
+        <button
+          className="button !bg-primary/[.8] !hover:bg-primary/[.7] !active:bg-primary !text-white cursor-pointer"
+          onClick={() => null}
+        >
+          Browse Files
+        </button>
       </div>
     </div>
   );

src/pages/ProofViewer/index.tsx

@@ -2,99 +2,41 @@ import React, {
   ReactNode,
   ReactElement,
   useState,
-  useEffect,
   MouseEventHandler,
-  useCallback,
 } from 'react';
 import { useParams, useNavigate } from 'react-router';
 import c from 'classnames';
-import {
-  deleteRequestHistory,
-  useRequestHistory,
-} from '../../reducers/history';
+import { useRequestHistory } from '../../reducers/history';
 import Icon from '../../components/Icon';
-import {
-  convertNotaryWsToHttp,
-  download,
-  isPopupWindow,
-} from '../../utils/misc';
-import classNames from 'classnames';
-import { useDispatch } from 'react-redux';
-import { RemoveHistory } from '../History/request-menu';
-import { PresentationJSON } from 'tlsn-js/build/types';
-import { RequestHistory } from '../../entries/Background/rpc';
+import { download } from '../../utils/misc';
 
 export default function ProofViewer(props?: {
-  className?: string;
   recv?: string;
   sent?: string;
-  verifierKey?: string;
-  notaryKey?: string;
-  info?: {
-    meta: { notaryUrl: string; websocketProxyUrl: string };
-    version: string;
-  };
 }): ReactElement {
-  const dispatch = useDispatch();
   const { requestId } = useParams<{ requestId: string }>();
   const request = useRequestHistory(requestId);
   const navigate = useNavigate();
   const [tab, setTab] = useState('sent');
-  const [isPopup, setIsPopup] = useState(isPopupWindow());
-  const [showRemoveModal, setShowRemoveModal] = useState(false);
-
-  const onDelete = useCallback(async () => {
-    if (requestId) {
-      dispatch(deleteRequestHistory(requestId));
-      if (isPopup) window.close();
-      navigate(-1);
-    }
-  }, [requestId]);
-
-  const notaryUrl = extractFromProps('notaryUrl', props, request);
-  const websocketProxyUrl = extractFromProps(
-    'websocketProxyUrl',
-    props,
-    request,
-  );
 
   return (
-    <div
-      className={classNames(
-        'flex flex-col w-full py-2 gap-2 flex-grow',
-        props?.className,
-      )}
-    >
-      <RemoveHistory
-        onRemove={onDelete}
-        showRemovalModal={showRemoveModal}
-        setShowRemoveModal={setShowRemoveModal}
-        onCancel={() => setShowRemoveModal(false)}
-      />
+    <div className="flex flex-col w-full py-2 gap-2 flex-grow">
       <div className="flex flex-col px-2">
         <div className="flex flex-row gap-2 items-center">
-          {!isPopup && (
-            <Icon
-              className={c(
-                'px-1 select-none cursor-pointer',
-                'text-slate-400 border-b-2 border-transparent hover:text-slate-500 active:text-slate-800',
-              )}
-              onClick={() => navigate(-1)}
-              fa="fa-solid fa-xmark"
-            />
-          )}
+          <Icon
+            className={c(
+              'px-1 select-none cursor-pointer',
+              'text-slate-400 border-b-2 border-transparent hover:text-slate-500 active:text-slate-800',
+            )}
+            onClick={() => navigate(-1)}
+            fa="fa-solid fa-xmark"
+          />
           <TabLabel onClick={() => setTab('sent')} active={tab === 'sent'}>
             Sent
           </TabLabel>
           <TabLabel onClick={() => setTab('recv')} active={tab === 'recv'}>
             Recv
           </TabLabel>
-          <TabLabel
-            onClick={() => setTab('metadata')}
-            active={tab === 'metadata'}
-          >
-            Metadata
-          </TabLabel>
           <div className="flex flex-row flex-grow items-center justify-end">
             {!props?.recv && (
               <button
@@ -107,12 +49,6 @@ export default function ProofViewer(props?: {
                 Download
               </button>
             )}
-            <button
-              className="button !text-red-500"
-              onClick={() => setShowRemoveModal(true)}
-            >
-              Delete
-            </button>
           </div>
         </div>
       </div>
@@ -121,71 +57,19 @@ export default function ProofViewer(props?: {
           <textarea
             className="w-full resize-none bg-slate-100 text-slate-800 border p-2 text-[10px] break-all h-full outline-none font-mono"
             value={props?.sent || request?.verification?.sent}
-            readOnly
           ></textarea>
         )}
         {tab === 'recv' && (
           <textarea
             className="w-full resize-none bg-slate-100 text-slate-800 border p-2 text-[10px] break-all h-full outline-none font-mono"
             value={props?.recv || request?.verification?.recv}
-            readOnly
           ></textarea>
         )}
-        {tab === 'metadata' && (
-          <div className="w-full resize-none bg-slate-100 text-slate-800 border p-2 text-[10px] break-all h-full outline-none font-mono">
-            <MetadataRow
-              label="Version"
-              //@ts-ignore
-              value={props?.info?.version || request?.proof?.version}
-            />
-            <MetadataRow label="Notary URL" value={notaryUrl} />
-            <MetadataRow
-              label="Websocket Proxy URL"
-              value={websocketProxyUrl}
-            />
-            <MetadataRow
-              label="Verifying Key"
-              value={props?.verifierKey || request?.verification?.verifierKey}
-            />
-            <MetadataRow
-              label="Notary Key"
-              value={props?.notaryKey || request?.verification?.notaryKey}
-            />
-          </div>
-        )}
       </div>
     </div>
   );
 }
 
-function extractFromProps(
-  key: 'notaryUrl' | 'websocketProxyUrl',
-  props?: {
-    className?: string;
-    recv?: string;
-    sent?: string;
-    verifierKey?: string;
-    notaryKey?: string;
-    info?: {
-      meta: { notaryUrl: string; websocketProxyUrl: string };
-      version: string;
-    };
-  },
-  request?: RequestHistory,
-) {
-  let value;
-
-  if (props?.info?.meta) {
-    value = props.info.meta[key];
-  } else if (request && (request?.proof as PresentationJSON)?.meta) {
-    value = (request.proof as PresentationJSON).meta[key];
-  } else {
-    value = '';
-  }
-
-  return value;
-}
-
 function TabLabel(props: {
   children: ReactNode;
   onClick: MouseEventHandler;
@@ -204,20 +88,3 @@ function TabLabel(props: {
     </button>
   );
 }
-
-function MetadataRow({
-  label,
-  value,
-}: {
-  label: string;
-  value: string | undefined;
-}) {
-  return (
-    <div>
-      <div>{label}:</div>
-      <div className="text-sm font-semibold whitespace-pre-wrap">
-        {value || 'N/A'}
-      </div>
-    </div>
-  );
-}

src/pages/RequestBuilder/index.tsx

@@ -11,20 +11,6 @@ import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
 import NavigateWithParams from '../../components/NavigateWithParams';
 import ResponseDetail from '../../components/ResponseDetail';
 import { urlify } from '../../utils/misc';
-import { notarizeRequest } from '../../reducers/requests';
-import {
-  getMaxRecv,
-  getMaxSent,
-  getNotaryApi,
-  getProxyApi,
-} from '../../utils/storage';
-import { useDispatch } from 'react-redux';
-import {
-  formatForRequest,
-  InputBody,
-  FormBodyTable,
-  parseResponse,
-} from '../../components/RequestBuilder';
 
 enum TabType {
   Params = 'Params',
@@ -39,32 +25,24 @@ export default function RequestBuilder(props?: {
   headers?: [string, string, boolean?][];
   body?: string;
   method?: string;
+  response?: Response;
 }): ReactElement {
   const loc = useLocation();
   const navigate = useNavigate();
-  const dispatch = useDispatch();
 
   const subpath = props?.subpath || '/custom';
   const [_url, setUrl] = useState(props?.url || '');
   const [params, setParams] = useState<[string, string, boolean?][]>(
     props?.params || [],
   );
-  const [body, setBody] = useState<string | undefined>(props?.body);
-  const [formBody, setFormBody] = useState<[string, string, boolean?][]>([
-    ['', '', true],
-  ]);
-  const [method, setMethod] = useState<string>(props?.method || 'GET');
-  const [type, setType] = useState<string>('text/plain');
   const [headers, setHeaders] = useState<[string, string, boolean?][]>(
-    props?.headers || [['Content-Type', type, true]],
+    props?.headers || [],
+  );
+  const [body, setBody] = useState<string | undefined>(props?.body);
+  const [method, setMethod] = useState<string>(props?.method || 'GET');
+  const [response, setResponse] = useState<Response | null>(
+    props?.response || null,
   );
-
-  const [responseData, setResponseData] = useState<{
-    json: any | null;
-    text: string | null;
-    img: string | null;
-    headers: [string, string][] | null;
-  } | null>(null);
 
   const url = urlify(_url);
 
@@ -79,26 +57,6 @@ export default function RequestBuilder(props?: {
     setParams(Array.from(url?.searchParams || []));
   }, [_url]);
 
-  useEffect(() => {
-    updateContentType(type);
-  }, [type, method]);
-
-  const updateContentType = useCallback(
-    (type: string) => {
-      const updateHeaders = headers.filter(
-        ([key]) => key.toLowerCase() !== 'content-type',
-      );
-      if (method === 'GET' || method === 'HEAD') {
-        updateHeaders.push(['Content-Type', type, true]);
-      } else {
-        updateHeaders.push(['Content-Type', type, false]);
-      }
-
-      setHeaders(updateHeaders);
-    },
-    [method, type, headers],
-  );
-
   const toggleParam = useCallback(
     (i: number) => {
       params[i][2] = !params[i][2];
@@ -133,7 +91,7 @@ export default function RequestBuilder(props?: {
 
   const sendRequest = useCallback(async () => {
     if (!href) return;
-    setResponseData(null);
+
     // eslint-disable-next-line no-undef
     const opts: RequestInit = {
       method,
@@ -144,13 +102,9 @@ export default function RequestBuilder(props?: {
         return map;
       }, {}),
     };
-    if (method !== 'GET' && method !== 'HEAD') {
-      if (type === 'application/x-www-form-urlencoded') {
-        opts.body = formatForRequest(formBody, type);
-      } else {
-        opts.body = formatForRequest(body!, type);
-      }
-    }
+
+    if (body) opts.body = body;
+
     const cookie = headers.find(([key]) => key === 'Cookie');
 
     if (cookie) {
@@ -160,64 +114,15 @@ export default function RequestBuilder(props?: {
 
     const res = await fetch(href, opts);
 
-    const contentType =
-      res.headers.get('content-type') || res.headers.get('Content-Type');
-
-    setResponseData(await parseResponse(contentType!, res));
+    setResponse(res);
 
     navigate(subpath + '/response');
-  }, [href, method, headers, body, type]);
-
-  const onNotarize = useCallback(async () => {
-    const maxSentData = await getMaxSent();
-    const maxRecvData = await getMaxRecv();
-
-    const notaryUrl = await getNotaryApi();
-    const websocketProxyUrl = await getProxyApi();
-
-    dispatch(
-      notarizeRequest(
-        //@ts-ignore
-        {
-          url: href || '',
-          method,
-          headers: headers.reduce((map: { [key: string]: string }, [k, v]) => {
-            if (k !== 'Cookie') {
-              map[k] = v;
-            }
-            return map;
-          }, {}),
-          body: body ? formatForRequest(body, type) : undefined,
-          maxSentData,
-          maxRecvData,
-          secretHeaders: [],
-          secretResps: [],
-          notaryUrl,
-          websocketProxyUrl,
-        },
-      ),
-    );
-
-    navigate('/history');
-  }, [href, method, headers, body, type]);
-
-  const onMethod = useCallback(
-    (e: React.ChangeEvent<HTMLSelectElement>) => {
-      const value = e.target.value;
-      if (value === 'GET' || value === 'HEAD') {
-        setType('');
-        setMethod(value);
-      } else {
-        setMethod(value);
-      }
-    },
-    [method, type],
-  );
+  }, [href, method, headers, body]);
 
   return (
     <div className="flex flex-col w-full py-2 gap-2 flex-grow">
       <div className="flex flex-row px-2">
-        <select className="select" onChange={(e) => onMethod(e)}>
+        <select className="select" onChange={(e) => setMethod(e.target.value)}>
           <option value="GET">GET</option>
           <option value="POST">POST</option>
           <option value="PUT">PUT</option>
@@ -229,14 +134,8 @@ export default function RequestBuilder(props?: {
         <input
           className="input border flex-grow"
           type="text"
-          value={_url}
+          value={url ? href : _url}
           onChange={(e) => setUrl(e.target.value)}
-          onBlur={() => {
-            const formattedUrl = urlify(_url);
-            if (formattedUrl) {
-              setUrl(formattedUrl.href);
-            }
-          }}
         />
         <button className="button" disabled={!url} onClick={sendRequest}>
           Send
@@ -262,19 +161,13 @@ export default function RequestBuilder(props?: {
           >
             Body
           </TabLabel>
-          {responseData && (
-            <div className="flex flex-row justify-between w-full">
-              <TabLabel
-                onClick={() => navigate(subpath + '/response')}
-                active={loc.pathname.includes('response')}
-              >
-                Response
-              </TabLabel>
-
-              <button className="button" onClick={onNotarize}>
-                Notarize
-              </button>
-            </div>
+          {response && (
+            <TabLabel
+              onClick={() => navigate(subpath + '/response')}
+              active={loc.pathname.includes('response')}
+            >
+              Response
+            </TabLabel>
           )}
         </div>
       </div>
@@ -304,38 +197,16 @@ export default function RequestBuilder(props?: {
           <Route
             path="body"
             element={
-              <div className="h-full">
-                <select
-                  className={c('select', {
-                    'w-[80px]':
-                      type === 'application/json' ||
-                      type === 'text/plain' ||
-                      type === '',
-                    'w-[200px]': type === 'application/x-www-form-urlencoded',
-                  })}
-                  value={type}
-                  onChange={(e) => setType(e.target.value)}
-                >
-                  <option value="text/plain">Text</option>
-                  <option value="application/json">JSON</option>
-                  <option value="application/x-www-form-urlencoded">
-                    x-www-form-urlencoded
-                  </option>
-                </select>
-                {type === 'application/x-www-form-urlencoded' ? (
-                  <FormBodyTable
-                    formBody={formBody}
-                    setFormBody={setFormBody}
-                  />
-                ) : (
-                  <InputBody body={body!} setBody={setBody} />
-                )}
-              </div>
+              <textarea
+                className="textarea h-full w-full resize-none"
+                value={body}
+                onChange={(e) => setBody(e.target.value)}
+              />
             }
           />
           <Route
             path="response"
-            element={<ResponseDetail responseData={responseData} />}
+            element={<ResponseDetail response={response} />}
           />
           <Route path="/" element={<NavigateWithParams to="/params" />} />
         </Routes>

src/pages/Requests/index.tsx

@@ -2,11 +2,11 @@ import React, { ReactElement } from 'react';
 import RequestTable from '../../components/RequestTable';
 import { useRequests } from '../../reducers/requests';
 
-export default function Requests(props: { shouldFix?: boolean }): ReactElement {
+export default function Requests(): ReactElement {
   const requests = useRequests();
   return (
     <>
-      <RequestTable shouldFix={props.shouldFix} requests={requests} />
+      <RequestTable requests={requests} />
     </>
   );
 }

src/pages/RunPluginByUrlApproval/index.tsx

@@ -1,148 +0,0 @@
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
-import Icon from '../../components/Icon';
-import { useSearchParams } from 'react-router-dom';
-import { type PluginConfig, PluginMetadata, urlify } from '../../utils/misc';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-import { BaseApproval } from '../BaseApproval';
-import { PluginPermissions } from '../../components/PluginInfo';
-import {
-  getPluginConfigByUrl,
-  getPluginMetadataByUrl,
-  getPluginByUrl,
-} from '../../entries/Background/db';
-import { SidePanelActionTypes } from '../../entries/SidePanel/types';
-import { deferredPromise } from '../../utils/promise';
-import { installPlugin } from '../../entries/Background/plugins/utils';
-
-export function RunPluginByUrlApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const url = params.get('url');
-  const pluginParams = params.get('params');
-  const hostname = urlify(origin || '')?.hostname;
-  const [error, showError] = useState('');
-  const [metadata, setPluginMetadata] = useState<PluginMetadata | null>(null);
-  const [pluginContent, setPluginContent] = useState<PluginConfig | null>(null);
-
-  useEffect(() => {
-    if (!url) return;
-    (async () => {
-      try {
-        const hex = await getPluginByUrl(url);
-
-        if (!hex) {
-          await installPlugin(url);
-        }
-
-        const config = await getPluginConfigByUrl(url);
-        const metadata = await getPluginMetadataByUrl(url);
-        setPluginContent(config);
-        setPluginMetadata(metadata);
-      } catch (e: any) {
-        showError(e?.message || 'Invalid Plugin');
-      }
-    })();
-  }, [url]);
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.run_plugin_by_url_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(async () => {
-    if (!url) return;
-    try {
-      const tab = await browser.tabs.create({
-        active: true,
-      });
-
-      const { promise, resolve } = deferredPromise();
-
-      const listener = async (request: any) => {
-        if (request.type === SidePanelActionTypes.panel_opened) {
-          browser.runtime.onMessage.removeListener(listener);
-          resolve();
-        }
-      };
-
-      browser.runtime.onMessage.addListener(listener);
-
-      // @ts-ignore
-      if (chrome.sidePanel) await chrome.sidePanel.open({ tabId: tab.id });
-
-      await promise;
-
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_request,
-        data: {
-          pluginUrl: url,
-          pluginParams: pluginParams ? JSON.parse(pluginParams) : undefined,
-        },
-      });
-
-      browser.runtime.sendMessage({
-        type: BackgroundActiontype.run_plugin_by_url_response,
-        data: true,
-      });
-    } catch (e: any) {
-      showError(e.message);
-    }
-  }, [url]);
-
-  return (
-    <BaseApproval
-      header={`Execute Plugin`}
-      onSecondaryClick={onCancel}
-      onPrimaryClick={onAccept}
-    >
-      <div className="flex flex-col items-center gap-2 py-8">
-        {!!favIconUrl ? (
-          <img
-            src={favIconUrl}
-            className="h-16 w-16 rounded-full border border-slate-200 bg-slate-200"
-            alt="logo"
-          />
-        ) : (
-          <Icon
-            fa="fa-solid fa-globe"
-            size={4}
-            className="h-16 w-16 rounded-full border border-slate-200 text-blue-500"
-          />
-        )}
-        <div className="text-2xl text-center px-8">
-          <b className="text-blue-500">{hostname}</b> wants to execute a plugin:
-        </div>
-      </div>
-      {!pluginContent && (
-        <div className="flex flex-col items-center flex-grow gap-4 border border-slate-300 p-8 mx-8 rounded bg-slate-100">
-          <Icon
-            className="animate-spin w-fit text-slate-500"
-            fa="fa-solid fa-spinner"
-            size={1}
-          />
-        </div>
-      )}
-      {pluginContent && (
-        <div className="flex flex-col gap-4 border border-slate-300 p-4 mx-8 rounded bg-slate-100">
-          <div className="flex flex-col items-center">
-            <img
-              className="w-12 h-12 mb-2"
-              src={pluginContent.icon}
-              alt="Plugin Icon"
-            />
-            <span className="text-2xl text-blue-600 font-semibold">
-              {pluginContent.title}
-            </span>
-            <div className="text-slate-500 text-base">
-              {pluginContent.description}
-            </div>
-          </div>
-        </div>
-      )}
-    </BaseApproval>
-  );
-}

src/reducers/history.tsx

@@ -1,7 +1,6 @@
 import {
   BackgroundActiontype,
   RequestHistory,
-  RequestProgress,
 } from '../entries/Background/rpc';
 import { useSelector } from 'react-redux';
 import { AppRootState } from './index';
@@ -9,9 +8,7 @@ import deepEqual from 'fast-deep-equal';
 
 enum ActionType {
   '/history/addRequest' = '/history/addRequest',
-  '/history/setRequests' = '/history/setRequests',
   '/history/deleteRequest' = '/history/deleteRequest',
-  '/history/addRequestCid' = '/history/addRequestCid',
 }
 
 type Action<payload> = {
@@ -40,20 +37,6 @@ export const addRequestHistory = (request?: RequestHistory | null) => {
   };
 };
 
-export const setRequests = (requests: RequestHistory[]) => {
-  return {
-    type: ActionType['/history/setRequests'],
-    payload: requests,
-  };
-};
-
-export const addRequestCid = (requestId: string, cid: string) => {
-  return {
-    type: ActionType['/history/addRequestCid'],
-    payload: { requestId, cid },
-  };
-};
-
 export const deleteRequestHistory = (id: string) => {
   chrome.runtime.sendMessage<any, string>({
     type: BackgroundActiontype.delete_prove_request,
@@ -77,9 +60,6 @@ export default function history(
       if (!payload) return state;
 
       const existing = state.map[payload.id];
-      if (existing?.progress === RequestProgress.Error) {
-        return state;
-      }
       const newMap = {
         ...state.map,
         [payload.id]: payload,
@@ -92,25 +72,6 @@ export default function history(
         order: newOrder,
       };
     }
-    case ActionType['/history/setRequests']: {
-      const payload: RequestHistory[] = action.payload;
-      const newMap = payload.reduce(
-        (map: { [id: string]: RequestHistory }, req) => {
-          if (state.map[req.id]?.progress === RequestProgress.Error) {
-            map[req.id] = state.map[req.id];
-          } else {
-            map[req.id] = req;
-          }
-          return map;
-        },
-        {},
-      );
-      return {
-        ...state,
-        map: newMap,
-        order: payload.map(({ id }) => id),
-      };
-    }
     case ActionType['/history/deleteRequest']: {
       const reqId: string = action.payload;
       const newMap = { ...state.map };
@@ -122,20 +83,6 @@ export default function history(
         order: newOrder,
       };
     }
-    case ActionType['/history/addRequestCid']: {
-      const { requestId, cid } = action.payload;
-      if (!state.map[requestId]) return state;
-      return {
-        ...state,
-        map: {
-          ...state.map,
-          [requestId]: {
-            ...state.map[requestId],
-            cid,
-          },
-        },
-      };
-    }
     default:
       return state;
   }
@@ -147,12 +94,6 @@ export const useHistoryOrder = (): string[] => {
   }, deepEqual);
 };
 
-export const useAllProofHistory = (): RequestHistory[] => {
-  return useSelector((state: AppRootState) => {
-    return state.history.order.map((id) => state.history.map[id]);
-  }, deepEqual);
-};
-
 export const useRequestHistory = (id?: string): RequestHistory | undefined => {
   return useSelector((state: AppRootState) => {
     if (!id) return undefined;

src/reducers/index.tsx

@@ -2,13 +2,11 @@ import { combineReducers } from 'redux';
 import requests from './requests';
 import history from './history';
 import plugins from './plugins';
-import p2p from './p2p';
 
 const rootReducer = combineReducers({
   requests,
   history,
   plugins,
-  p2p,
 });
 
 export type AppRootState = ReturnType<typeof rootReducer>;

src/reducers/p2p.ts

@@ -1,375 +0,0 @@
-import { useSelector } from 'react-redux';
-import { AppRootState } from './index';
-import deepEqual from 'fast-deep-equal';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../entries/Background/rpc';
-
-enum ActionType {
-  '/p2p/setConnected' = '/p2p/setConnected',
-  '/p2p/setClientId' = '/p2p/setClientId',
-  '/p2p/setPairing' = '/p2p/setPairing',
-  '/p2p/setError' = '/p2p/setError',
-  '/p2p/appendIncomingPairingRequest' = '/p2p/appendIncomingPairingRequest',
-  '/p2p/appendOutgoingPairingRequest' = '/p2p/appendOutgoingPairingRequest',
-  '/p2p/setIncomingPairingRequest' = '/p2p/setIncomingPairingRequest',
-  '/p2p/setOutgoingPairingRequest' = '/p2p/setOutgoingPairingRequest',
-  '/p2p/appendIncomingProofRequest' = '/p2p/appendIncomingProofRequest',
-  '/p2p/appendOutgoingProofRequest' = '/p2p/appendOutgoingProofRequest',
-  '/p2p/setIncomingProofRequest' = '/p2p/setIncomingProofRequest',
-  '/p2p/setOutgoingProofRequest' = '/p2p/setOutgoingProofRequest',
-  '/p2p/setIsProving' = '/p2p/setIsProving',
-  '/p2p/setIsVerifying' = '/p2p/setIsVerifying',
-  '/p2p/setPresentation' = '/p2p/setPresentation',
-}
-
-type Action<payload> = {
-  type: ActionType;
-  payload?: payload;
-  error?: boolean;
-  meta?: any;
-};
-
-type State = {
-  clientId: string;
-  pairing: string;
-  connected: boolean;
-  error: string;
-  incomingPairingRequests: string[];
-  outgoingPairingRequests: string[];
-  incomingProofRequests: string[];
-  outgoingProofRequests: string[];
-  isProving: boolean;
-  isVerifying: boolean;
-  presentation: null | {
-    sent: string;
-    recv: string;
-  };
-};
-
-export type RequestProofMessage = {
-  to: string;
-  from: string;
-  id: number;
-  text?: undefined;
-};
-
-const initialState: State = {
-  clientId: '',
-  pairing: '',
-  error: '',
-  connected: false,
-  incomingPairingRequests: [],
-  outgoingPairingRequests: [],
-  incomingProofRequests: [],
-  outgoingProofRequests: [],
-  isProving: false,
-  isVerifying: false,
-  presentation: null,
-};
-
-export const fetchP2PState = async () => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.get_p2p_state,
-  });
-};
-
-export const connectRendezvous = () => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.connect_rendezvous,
-  });
-};
-
-export const disconnectRendezvous = () => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.disconnect_rendezvous,
-  });
-};
-
-export const setConnected = (connected = false) => ({
-  type: ActionType['/p2p/setConnected'],
-  payload: connected,
-});
-
-export const setClientId = (clientId: string) => ({
-  type: ActionType['/p2p/setClientId'],
-  payload: clientId,
-});
-
-export const setPairing = (clientId: string) => ({
-  type: ActionType['/p2p/setPairing'],
-  payload: clientId,
-});
-
-export const appendIncomingPairingRequests = (peerId: string) => ({
-  type: ActionType['/p2p/appendIncomingPairingRequest'],
-  payload: peerId,
-});
-
-export const appendIncomingProofRequests = (peerId: string) => ({
-  type: ActionType['/p2p/appendIncomingProofRequest'],
-  payload: peerId,
-});
-
-export const appendOutgoingPairingRequests = (peerId: string) => ({
-  type: ActionType['/p2p/appendOutgoingPairingRequest'],
-  payload: peerId,
-});
-
-export const appendOutgoingProofRequest = (peerId: string) => ({
-  type: ActionType['/p2p/appendOutgoingProofRequest'],
-  payload: peerId,
-});
-
-export const setIncomingPairingRequest = (peerIds: string[]) => ({
-  type: ActionType['/p2p/setIncomingPairingRequest'],
-  payload: peerIds,
-});
-
-export const setOutgoingPairingRequest = (peerIds: string[]) => ({
-  type: ActionType['/p2p/setOutgoingPairingRequest'],
-  payload: peerIds,
-});
-
-export const setIncomingProofRequest = (peerIds: string[]) => ({
-  type: ActionType['/p2p/setIncomingProofRequest'],
-  payload: peerIds,
-});
-
-export const setOutgoingProofRequest = (peerIds: string[]) => ({
-  type: ActionType['/p2p/setOutgoingProofRequest'],
-  payload: peerIds,
-});
-
-export const setP2PError = (error: string) => ({
-  type: ActionType['/p2p/setError'],
-  payload: error,
-});
-
-export const setIsProving = (proving: boolean) => ({
-  type: ActionType['/p2p/setIsProving'],
-  payload: proving,
-});
-
-export const setIsVerifying = (verifying: boolean) => ({
-  type: ActionType['/p2p/setIsVerifying'],
-  payload: verifying,
-});
-
-export const setP2PPresentation = (
-  presentation: null | { sent: string; recv: string },
-) => ({
-  type: ActionType['/p2p/setPresentation'],
-  payload: presentation,
-});
-
-export const requestProofByHash = (pluginHash: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.request_p2p_proof_by_hash,
-    data: pluginHash,
-  });
-};
-
-export const sendPairRequest = async (targetId: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.send_pair_request,
-    data: targetId,
-  });
-};
-
-export const cancelPairRequest = async (targetId: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.cancel_pair_request,
-    data: targetId,
-  });
-};
-
-export const acceptPairRequest = async (targetId: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.accept_pair_request,
-    data: targetId,
-  });
-};
-
-export const rejectPairRequest = async (targetId: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.reject_pair_request,
-    data: targetId,
-  });
-};
-
-export const cancelProofRequest = async (plughinHash: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.cancel_proof_request,
-    data: plughinHash,
-  });
-};
-
-export const acceptProofRequest = async (plughinHash: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.accept_proof_request,
-    data: plughinHash,
-  });
-};
-
-export const rejectProofRequest = async (plughinHash: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.reject_proof_request,
-    data: plughinHash,
-  });
-};
-
-export default function p2p(state = initialState, action: Action<any>): State {
-  switch (action.type) {
-    case ActionType['/p2p/setConnected']:
-      return {
-        ...state,
-        connected: action.payload,
-      };
-    case ActionType['/p2p/setClientId']:
-      return {
-        ...state,
-        clientId: action.payload,
-      };
-    case ActionType['/p2p/setPairing']:
-      return {
-        ...state,
-        pairing: action.payload,
-      };
-    case ActionType['/p2p/appendIncomingPairingRequest']:
-      return {
-        ...state,
-        incomingPairingRequests: [
-          ...new Set(state.incomingPairingRequests.concat(action.payload)),
-        ],
-      };
-    case ActionType['/p2p/appendOutgoingPairingRequest']:
-      return {
-        ...state,
-        outgoingPairingRequests: [
-          ...new Set(state.outgoingPairingRequests.concat(action.payload)),
-        ],
-      };
-    case ActionType['/p2p/setIncomingPairingRequest']:
-      return {
-        ...state,
-        incomingPairingRequests: action.payload,
-      };
-    case ActionType['/p2p/setOutgoingPairingRequest']:
-      return {
-        ...state,
-        outgoingPairingRequests: action.payload,
-      };
-    case ActionType['/p2p/appendIncomingProofRequest']:
-      return {
-        ...state,
-        incomingProofRequests: [
-          ...new Set(state.incomingProofRequests.concat(action.payload)),
-        ],
-      };
-    case ActionType['/p2p/appendOutgoingProofRequest']:
-      return {
-        ...state,
-        outgoingProofRequests: [
-          ...new Set(state.outgoingProofRequests.concat(action.payload)),
-        ],
-      };
-    case ActionType['/p2p/setIncomingProofRequest']:
-      return {
-        ...state,
-        incomingProofRequests: action.payload,
-      };
-    case ActionType['/p2p/setOutgoingProofRequest']:
-      return {
-        ...state,
-        outgoingProofRequests: action.payload,
-      };
-    case ActionType['/p2p/setError']:
-      return {
-        ...state,
-        error: action.payload,
-      };
-    case ActionType['/p2p/setIsProving']:
-      return {
-        ...state,
-        isProving: action.payload,
-      };
-    case ActionType['/p2p/setIsVerifying']:
-      return {
-        ...state,
-        isVerifying: action.payload,
-      };
-    case ActionType['/p2p/setPresentation']:
-      return {
-        ...state,
-        presentation: action.payload,
-      };
-    default:
-      return state;
-  }
-}
-
-export function useClientId() {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.clientId;
-  }, deepEqual);
-}
-
-export function useConnected() {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.connected;
-  }, deepEqual);
-}
-
-export function usePairId(): string {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.pairing;
-  }, deepEqual);
-}
-
-export function useIncomingPairingRequests(): string[] {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.incomingPairingRequests;
-  }, deepEqual);
-}
-
-export function useOutgoingPairingRequests(): string[] {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.outgoingPairingRequests;
-  }, deepEqual);
-}
-
-export function useIncomingProofRequests(): string[] {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.incomingProofRequests;
-  }, deepEqual);
-}
-
-export function useOutgoingProofRequests(): string[] {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.outgoingProofRequests;
-  }, deepEqual);
-}
-
-export function useP2PError(): string {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.error;
-  }, deepEqual);
-}
-
-export function useP2PVerifying(): boolean {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.isVerifying;
-  }, deepEqual);
-}
-
-export function useP2PProving(): boolean {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.isProving;
-  }, deepEqual);
-}
-
-export function useP2PPresentation(): null | { sent: string; recv: string } {
-  return useSelector((state: AppRootState) => {
-    return state.p2p.presentation;
-  }, deepEqual);
-}

src/reducers/plugins.tsx

@@ -1,9 +1,6 @@
 import { useSelector } from 'react-redux';
 import { AppRootState } from './index';
 import deepEqual from 'fast-deep-equal';
-import { useEffect, useState } from 'react';
-import { getPluginConfigByUrl } from '../entries/Background/db';
-import { PluginConfig } from '../utils/misc';
 
 enum ActionType {
   '/plugin/addPlugin' = '/plugin/addPlugin',
@@ -55,13 +52,3 @@ export const usePluginHashes = (): string[] => {
     return state.plugins.order;
   }, deepEqual);
 };
-
-export const usePluginConfig = (hash: string) => {
-  const [config, setConfig] = useState<PluginConfig | null>(null);
-  useEffect(() => {
-    (async function () {
-      setConfig(await getPluginConfigByUrl(hash));
-    })();
-  }, [hash]);
-  return config;
-};

src/reducers/requests.ts

@@ -18,7 +18,6 @@ enum ActionType {
   '/requests/setRequests' = '/requests/setRequests',
   '/requests/addRequest' = '/requests/addRequest',
   '/requests/setActiveTab' = '/requests/setActiveTab',
-  '/requests/isConnected' = '/requests/isConnected',
 }
 
 type Action<payload> = {
@@ -33,22 +32,11 @@ type State = {
     [requestId: string]: RequestLog;
   };
   activeTab: chrome.tabs.Tab | null;
-  isConnected: boolean;
 };
 
 const initialState: State = {
   map: {},
   activeTab: null,
-  isConnected: false,
-};
-
-export const setConnection = (isConnected: boolean): Action<boolean> => ({
-  type: ActionType['/requests/isConnected'],
-  payload: isConnected,
-});
-
-export const isConnected = (isConnected: boolean) => async () => {
-  return isConnected;
 };
 
 export const setRequests = (requests: RequestLog[]): Action<RequestLog[]> => ({
@@ -69,6 +57,7 @@ export const notarizeRequest = (options: RequestHistory) => async () => {
       method: options.method,
       headers: options.headers,
       body: options.body,
+      maxTranscriptSize: options.maxTranscriptSize,
       maxSentData,
       maxRecvData,
       secretHeaders: options.secretHeaders,
@@ -124,11 +113,6 @@ export default function requests(
           [action.payload.requestId]: action.payload,
         },
       };
-    case ActionType['/requests/isConnected']:
-      return {
-        ...state,
-        isConnected: action.payload,
-      };
     default:
       return state;
   }
@@ -158,7 +142,3 @@ export const useActiveTabUrl = (): URL | null => {
     return activeTab?.url ? new URL(activeTab.url) : null;
   }, deepEqual);
 };
-
-export const useIsConnected = (): boolean => {
-  return useSelector((state: AppRootState) => state.requests.isConnected);
-};

src/utils/constants.ts

@@ -1,6 +1,9 @@
 export const EXPLORER_API = 'https://explorer.tlsnotary.org';
-export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.12';
-export const RENDEZVOUS_API = 'wss://explorer.tlsnotary.org';
+export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.5';
 export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy';
 export const MAX_RECV = 16384;
 export const MAX_SENT = 4096;
+export const LOGGING_LEVEL_NONE = ' ';
+export const LOGGING_LEVEL_INFO = 'info,tlsn_extension_rs=info';
+export const LOGGING_LEVEL_DEBUG = 'debug,tlsn_extension_rs=debug';
+export const LOGGING_LEVEL_TRACE = 'trace,tlsn_extension_rs=trace';

src/utils/misc.ts

@@ -1,25 +1,18 @@
 import {
   BackgroundActiontype,
-  handleExecP2PPluginProver,
   handleExecPluginProver,
   RequestLog,
 } from '../entries/Background/rpc';
 import { EXPLORER_API } from './constants';
-import createPlugin, {
-  CallContext,
-  ExtismPluginOptions,
-  Plugin,
-} from '@extism/extism';
+import createPlugin, { CallContext, Plugin } from '@extism/extism';
 import browser from 'webextension-polyfill';
 import NodeCache from 'node-cache';
-import { getNotaryApi, getProxyApi } from './storage';
-import { minimatch } from 'minimatch';
 import {
-  getCookiesByHost,
-  getHeadersByHost,
-  getLocalStorageByHost,
-  getSessionStorageByHost,
-} from '../entries/Background/db';
+  getCookieStoreByHost,
+  getHeaderStoreByHost,
+} from '../entries/Background/cache';
+import { getNotaryApi, getProxyApi } from './storage';
+
 const charwise = require('charwise');
 
 export function urlify(
@@ -89,19 +82,6 @@ export const copyText = async (text: string): Promise<void> => {
   }
 };
 
-export function convertNotaryWsToHttp(notaryWs: string) {
-  const { protocol, pathname, hostname, port } = new URL(notaryWs);
-
-  if (protocol === 'https:' || protocol === 'http:') {
-    return notaryWs;
-  }
-  const p = protocol === 'wss:' ? 'https:' : 'http:';
-  const pt = port ? `:${port}` : '';
-  const path = pathname === '/' ? '' : pathname.replace('/notarize', '');
-  const h = hostname === 'localhost' ? '127.0.0.1' : hostname;
-  return p + '//' + h + pt + path;
-}
-
 export async function replayRequest(req: RequestLog): Promise<string> {
   const options = {
     method: req.method,
@@ -166,16 +146,12 @@ const VALID_HOST_FUNCS: { [name: string]: string } = {
 export const makePlugin = async (
   arrayBuffer: ArrayBuffer,
   config?: PluginConfig,
-  meta?: {
-    p2p: boolean;
-    clientId: string;
-  },
 ) => {
   const module = await WebAssembly.compile(arrayBuffer);
   const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
 
   const injectedConfig = {
-    tabUrl: tab?.url || 'x://x',
+    tabUrl: tab?.url,
     tabId: tab?.id,
   };
 
@@ -199,8 +175,7 @@ export const makePlugin = async (
 
       if (
         !approvedRequests.find(
-          ({ method, url }) =>
-            method === params.method && minimatch(params.url, url),
+          ({ method, url }) => method === params.method && url === params.url,
         )
       ) {
         throw new Error(`Unapproved request - ${params.method}: ${params.url}`);
@@ -220,55 +195,18 @@ export const makePlugin = async (
         throw new Error(`Unapproved proxy: ${params.websocketProxyUrl}`);
       }
 
-      (async () => {
-        const {
-          getSecretResponse,
-          body: reqBody,
-          interactive,
-          verifierPlugin,
-        } = params;
-
-        console.log('interactive', interactive);
-        console.log('verifierPlugin', verifierPlugin);
-        console.log('params', params);
-        if (interactive) {
-          const pluginHex = Buffer.from(arrayBuffer).toString('hex');
-          const pluginUrl = await sha256(pluginHex);
-
-          handleExecP2PPluginProver({
-            type: BackgroundActiontype.execute_p2p_plugin_prover,
-            data: {
-              ...params,
-              pluginUrl,
-              pluginHex,
-              body: reqBody,
-              now,
-              verifierPlugin,
-            },
-          });
-        } else {
-          handleExecPluginProver({
-            type: BackgroundActiontype.execute_plugin_prover,
-            data: {
-              ...params,
-              body: reqBody,
-              getSecretResponseFn: async (body: string) => {
-                return new Promise((resolve) => {
-                  setTimeout(async () => {
-                    const out = await plugin.call(getSecretResponse, body);
-                    resolve(JSON.parse(out?.string() || '{}'));
-                  }, 0);
-                });
-              },
-              now,
-            },
-          });
-        }
-      })();
+      handleExecPluginProver({
+        type: BackgroundActiontype.execute_plugin_prover,
+        data: {
+          ...params,
+          now,
+        },
+      });
 
       return context.store(`${id}`);
     },
   };
+
   const funcs: {
     [key: string]: (callContext: CallContext, ...args: any[]) => any;
   } = {};
@@ -285,107 +223,58 @@ export const makePlugin = async (
     }
   }
 
-  if (config?.localStorage) {
-    const localStorage: { [hostname: string]: { [key: string]: string } } = {};
-
-    const [tab] = await chrome.tabs.query({
-      active: true,
-      lastFocusedWindow: true,
-    });
-    await chrome.tabs.sendMessage(tab.id as number, {
-      type: BackgroundActiontype.get_local_storage,
-    });
-
-    //@ts-ignore
-    for (const host of config.localStorage) {
-      const cache = await getLocalStorageByHost(host);
-      localStorage[host] = cache;
-    }
-    //@ts-ignore
-    injectedConfig.localStorage = JSON.stringify(localStorage);
-  }
-
-  if (config?.sessionStorage) {
-    const sessionStorage: { [hostname: string]: { [key: string]: string } } =
-      {};
-
-    const [tab] = await chrome.tabs.query({
-      active: true,
-      lastFocusedWindow: true,
-    });
-    await chrome.tabs.sendMessage(tab.id as number, {
-      type: BackgroundActiontype.get_session_storage,
-    });
-    //@ts-ignore
-    for (const host of config.sessionStorage) {
-      const cache = await getSessionStorageByHost(host);
-      sessionStorage[host] = cache;
-    }
-    //@ts-ignore
-    injectedConfig.sessionStorage = JSON.stringify(sessionStorage);
-  }
-
   if (config?.cookies) {
-    const cookies: { [link: string]: { [key: string]: string } } = {};
-    for (const link of config.cookies) {
-      const cache = await getCookiesByHost(link);
-      cookies[link] = cache;
+    const cookies: { [hostname: string]: { [key: string]: string } } = {};
+    for (const host of config.cookies) {
+      const cache = getCookieStoreByHost(host);
+      cookies[host] = cacheToMap(cache);
     }
     // @ts-ignore
     injectedConfig.cookies = JSON.stringify(cookies);
   }
 
   if (config?.headers) {
-    const headers: { [link: string]: { [key: string]: string } } = {};
-    for (const link of config.headers) {
-      const cache = await getHeadersByHost(link);
-      headers[link] = cache;
+    const headers: { [hostname: string]: { [key: string]: string } } = {};
+    for (const host of config.headers) {
+      const cache = getHeaderStoreByHost(host);
+      headers[host] = cacheToMap(cache);
     }
     // @ts-ignore
     injectedConfig.headers = JSON.stringify(headers);
   }
 
-  const pluginConfig: ExtismPluginOptions = {
+  const pluginConfig = {
     useWasi: true,
     config: injectedConfig,
-    // allowedHosts: approvedRequests.map((r) => urlify(r.url)?.origin),
     functions: {
       'extism:host/user': funcs,
     },
   };
-
   const plugin = await createPlugin(module, pluginConfig);
   return plugin;
 };
 
 export type StepConfig = {
-  title: string; // Text for the step's title
-  description?: string; // Text for the step's description (optional)
-  cta: string; // Text for the step's call-to-action button
-  action: string; // The function name that this step will execute
-  prover?: boolean; // Boolean indicating if this step outputs a notarization (optional)
+  title: string;
+  description?: string;
+  cta: string;
+  action: string;
+  prover?: boolean;
 };
 
 export type PluginConfig = {
-  title: string; // The name of the plugin
-  description: string; // A description of the plugin purpose
-  icon?: string; // A base64-encoded image string representing the plugin's icon (optional)
-  steps?: StepConfig[]; // An array describing the UI steps and behavior (see Step UI below) (optional)
-  hostFunctions?: string[]; // Host functions that the plugin will have access to
-  cookies?: string[]; // Cookies the plugin will have access to, cached by the extension from specified hosts (optional)
-  headers?: string[]; // Headers the plugin will have access to, cached by the extension from specified hosts (optional)
-  localStorage?: string[]; // LocalStorage the plugin will have access to, cached by the extension from specified hosts (optional)
-  sessionStorage?: string[]; // SessionStorage the plugin will have access to, cached by the extension from specified hosts (optional)
-  requests: { method: string; url: string }[]; // List of requests that the plugin is allowed to make
-  notaryUrls?: string[]; // List of notary services that the plugin is allowed to use (optional)
-  proxyUrls?: string[]; // List of websocket proxies that the plugin is allowed to use (optional)
+  title: string;
+  description: string;
+  icon?: string;
+  steps?: StepConfig[];
+  hostFunctions?: string[];
+  cookies?: string[];
+  headers?: string[];
+  requests: { method: string; url: string }[];
+  notaryUrls?: string[];
+  proxyUrls?: string[];
 };
 
-export type PluginMetadata = {
-  origin: string;
-  filePath: string;
-} & { [k: string]: string };
-
 export const getPluginConfig = async (
   data: Plugin | ArrayBuffer,
 ): Promise<PluginConfig> => {
@@ -425,16 +314,7 @@ export const getPluginConfig = async (
       assert(typeof name === 'string' && name.length);
     }
   }
-  if (config.localStorage) {
-    for (const name of config.localStorage) {
-      assert(typeof name === 'string' && name.length);
-    }
-  }
-  if (config.sessionStorage) {
-    for (const name of config.sessionStorage) {
-      assert(typeof name === 'string' && name.length);
-    }
-  }
+
   if (config.headers) {
     for (const name of config.headers) {
       assert(typeof name === 'string' && name.length);
@@ -468,17 +348,3 @@ export const cacheToMap = (cache: NodeCache) => {
     return acc;
   }, {});
 };
-
-export function safeParseJSON(data?: string | null) {
-  try {
-    return JSON.parse(data!);
-  } catch (e) {
-    return null;
-  }
-}
-
-export function isPopupWindow(): boolean {
-  return (
-    !!window.opener || window.matchMedia('(display-mode: standalone)').matches
-  );
-}

src/utils/parser.ts

@@ -1,33 +0,0 @@
-import { HTTPParser } from 'http-parser-js';
-
-export function parseHttpMessage(buffer: Buffer, type: 'request' | 'response') {
-  const parser = new HTTPParser(
-    type === 'request' ? HTTPParser.REQUEST : HTTPParser.RESPONSE,
-  );
-  const body: Buffer[] = [];
-  let complete = false;
-  let headers: string[] = [];
-
-  parser.onBody = (t) => {
-    body.push(t);
-  };
-
-  parser.onHeadersComplete = (res) => {
-    headers = res.headers;
-  };
-
-  parser.onMessageComplete = () => {
-    complete = true;
-  };
-
-  parser.execute(buffer);
-  parser.finish();
-
-  if (!complete) throw new Error(`Could not parse ${type.toUpperCase()}`);
-
-  return {
-    info: buffer.toString('utf-8').split('\r\n')[0],
-    headers,
-    body,
-  };
-}

src/utils/plugins.tsx

@@ -1,87 +0,0 @@
-import { PluginConfig } from './misc';
-import React, { ReactElement, ReactNode } from 'react';
-import Icon from '../components/Icon';
-
-export const HostFunctionsDescriptions: {
-  [key: string]: (pluginContent: PluginConfig) => ReactElement;
-} = {
-  redirect: () => {
-    return (
-      <PermissionDescription fa="fa-solid fa-diamond-turn-right">
-        <span>Redirect your current tab to any URL</span>
-      </PermissionDescription>
-    );
-  },
-  notarize: ({ notaryUrls, proxyUrls }) => {
-    const notaries = ['default notary', 'your peer'].concat(notaryUrls || []);
-    const proxies = ['default proxy'].concat(proxyUrls || []);
-
-    return (
-      <>
-        <PermissionDescription fa="fa-solid fa-route">
-          <span className="cursor-default">
-            <span className="mr-1">Proxy notarization requests thru</span>
-            <MultipleParts parts={proxies} />
-          </span>
-        </PermissionDescription>
-        <PermissionDescription fa="fa-solid fa-stamp">
-          <span className="cursor-default">
-            <span className="mr-1">Submit notarization requests to</span>
-            <MultipleParts parts={notaries} />
-          </span>
-        </PermissionDescription>
-      </>
-    );
-  },
-};
-
-export function PermissionDescription({
-  fa,
-  children,
-}: {
-  fa: string;
-  children?: ReactNode;
-}): ReactElement {
-  return (
-    <div className="flex flex-row gap-4 items-start cursor-default">
-      <Icon className="" size={1.6125} fa={fa} />
-      <div className="text-sm mt-[0.125rem]">{children}</div>
-    </div>
-  );
-}
-
-export function MultipleParts({ parts }: { parts: string[] }): ReactElement {
-  const content = [];
-
-  if (parts.length > 1) {
-    for (let i = 0; i < parts.length; i++) {
-      content.push(
-        <span key={i} className="text-blue-600">
-          {parts[i]}
-        </span>,
-      );
-
-      if (parts.length - i === 2) {
-        content.push(
-          <span key={i + 'separator'} className="inline-block mx-1">
-            and
-          </span>,
-        );
-      } else if (parts.length - i > 1) {
-        content.push(
-          <span key={i + 'separator'} className="inline-block mr-1">
-            ,
-          </span>,
-        );
-      }
-    }
-  } else {
-    content.push(
-      <span key={0} className="text-blue-600">
-        {parts[0]}
-      </span>,
-    );
-  }
-
-  return <>{content}</>;
-}

src/utils/promise.ts

@@ -1,17 +0,0 @@
-export const deferredPromise = (): {
-  promise: Promise<never>;
-  resolve: (data?: any) => void;
-  reject: (reason?: any) => void;
-} => {
-  let resolve: (data?: any) => void, reject: (reason?: any) => void;
-
-  const promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-
-  // @ts-ignore
-  return { promise, resolve, reject };
-};
-
-export type PromiseResolvers = ReturnType<typeof deferredPromise>;

src/utils/rpc.ts

@@ -2,10 +2,24 @@ import browser from 'webextension-polyfill';
 import { BackgroundActiontype } from '../entries/Background/rpc';
 import { PluginConfig } from './misc';
 
-export async function addPlugin(hex: string, url: string) {
+export async function getCookiesByHost(hostname: string) {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.get_cookies_by_hostname,
+    data: hostname,
+  });
+}
+
+export async function getHeadersByHost(hostname: string) {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.get_headers_by_hostname,
+    data: hostname,
+  });
+}
+
+export async function addPlugin(hex: string) {
   return browser.runtime.sendMessage({
     type: BackgroundActiontype.add_plugin,
-    data: { hex, url },
+    data: hex,
   });
 }
 
@@ -38,12 +52,7 @@ export async function fetchPluginConfigByHash(
   });
 }
 
-export async function runPlugin(
-  hash: string,
-  method: string,
-  params?: string,
-  meta?: any,
-) {
+export async function runPlugin(hash: string, method: string, params?: string) {
   return browser.runtime.sendMessage({
     type: BackgroundActiontype.run_plugin,
     data: {
@@ -51,6 +60,5 @@ export async function runPlugin(
       method,
       params,
     },
-    meta,
   });
 }

src/utils/storage.ts

@@ -1,14 +1,10 @@
-import { LoggingLevel } from 'tlsn-js';
-import { MAX_RECV, MAX_SENT, NOTARY_API, NOTARY_PROXY } from './constants';
-import { RENDEZVOUS_API } from './constants';
+import { LOGGING_LEVEL_INFO } from './constants';
 
 export const NOTARY_API_LS_KEY = 'notary-api';
 export const PROXY_API_LS_KEY = 'proxy-api';
 export const MAX_SENT_LS_KEY = 'max-sent';
 export const MAX_RECEIVED_LS_KEY = 'max-received';
-export const LOGGING_FILTER_KEY = 'logging-filter-2';
-export const RENDEZVOUS_API_LS_KEY = 'rendezvous-api';
-export const DEVELOPER_MODE_LS_KEY = 'developer-mode';
+export const LOGGING_FILTER_KEY = 'logging-filter';
 
 export async function set(key: string, value: string) {
   return chrome.storage.sync.set({ [key]: value });
@@ -18,34 +14,25 @@ export async function get(key: string, defaultValue?: string) {
   return chrome.storage.sync
     .get(key)
     .then((json: any) => json[key] || defaultValue)
-    .catch(() => defaultValue);
+    .catch(() => '');
 }
 
 export async function getMaxSent() {
-  return parseInt(await get(MAX_SENT_LS_KEY, MAX_SENT.toString()));
+  return parseInt(await get(MAX_SENT_LS_KEY, '4096'));
 }
 
 export async function getMaxRecv() {
-  return parseInt(await get(MAX_RECEIVED_LS_KEY, MAX_RECV.toString()));
+  return parseInt(await get(MAX_RECEIVED_LS_KEY, '16384'));
 }
 
 export async function getNotaryApi() {
-  return await get(NOTARY_API_LS_KEY, NOTARY_API);
+  return await get(NOTARY_API_LS_KEY, 'https://notary.pse.dev/v0.1.0-alpha.5');
 }
 
 export async function getProxyApi() {
-  return await get(PROXY_API_LS_KEY, NOTARY_PROXY);
+  return await get(PROXY_API_LS_KEY, 'wss://notary.pse.dev/proxy');
 }
 
-export async function getLoggingFilter(): Promise<LoggingLevel> {
-  return await get(LOGGING_FILTER_KEY, 'Info');
-}
-
-export async function getRendezvousApi(): Promise<string> {
-  return await get(RENDEZVOUS_API_LS_KEY, RENDEZVOUS_API);
-}
-
-export async function getDeveloperMode(): Promise<boolean> {
-  const value = await get(DEVELOPER_MODE_LS_KEY, 'false');
-  return value === 'true';
+export async function getLoggingFilter() {
+  return await get(LOGGING_FILTER_KEY, LOGGING_LEVEL_INFO);
 }

utils/build.js

@@ -22,28 +22,6 @@ config.plugins = (config.plugins || []).concat(
   }),
 );
 
-webpack(config, function (err, stats) {
-  if (err) {
-    console.error('Webpack error:', err);
-    process.exit(1);
-  }
-
-  if (stats.hasErrors()) {
-    console.error('Build failed with errors:');
-    const info = stats.toJson();
-    console.error(info.errors.map((e) => e.message).join('\n\n'));
-    process.exit(1);
-  }
-
-  if (stats.hasWarnings()) {
-    console.warn('Build completed with warnings:');
-    const info = stats.toJson();
-    console.warn(info.warnings.map((w) => w.message).join('\n\n'));
-  }
-
-  console.log('Build completed successfully!');
-  console.log(`Output: ${path.join(__dirname, '../', 'build')}`);
-  console.log(
-    `Zip: ${path.join(__dirname, '../', 'zip', `${packageInfo.name}-${packageInfo.version}.zip`)}`,
-  );
+webpack(config, function (err) {
+  if (err) throw err;
 });

webpack.config.js

@@ -7,6 +7,7 @@ var webpack = require("webpack"),
   TerserPlugin = require("terser-webpack-plugin");
 var { CleanWebpackPlugin } = require("clean-webpack-plugin");
 var ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
+var ReactRefreshTypeScript = require("react-refresh-typescript");
 var ExtReloader = require('webpack-ext-reloader');
 
 const ASSET_PATH = process.env.ASSET_PATH || "/";
@@ -39,11 +40,7 @@ var options = {
   mode: process.env.NODE_ENV || "development",
   ignoreWarnings: [
     /Circular dependency between chunks with runtime/,
-    /ResizeObserver loop completed with undelivered notifications/,
-    /Should not import the named export/,
-    /Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0/,
-    /Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0./,
-    /repetitive deprecation warnings omitted/,
+    /ResizeObserver loop completed with undelivered notifications/
   ],
 
   entry: {
@@ -51,7 +48,6 @@ var options = {
     popup: path.join(__dirname, "src", "entries", "Popup", "index.tsx"),
     background: path.join(__dirname, "src", "entries", "Background", "index.ts"),
     contentScript: path.join(__dirname, "src", "entries", "Content", "index.ts"),
-    content: path.join(__dirname, "src", "entries", "Content", "content.ts"),
     offscreen: path.join(__dirname, "src", "entries", "Offscreen", "index.tsx"),
     sidePanel: path.join(__dirname, "src", "entries", "SidePanel", "index.tsx"),
   },
@@ -85,9 +81,6 @@ var options = {
             loader: "sass-loader",
             options: {
               sourceMap: true,
-              sassOptions: {
-                silenceDeprecations: ["legacy-js-api"],
-              }
             },
           },
         ],
@@ -113,6 +106,11 @@ var options = {
           {
             loader: require.resolve("ts-loader"),
             options: {
+              getCustomTransformers: () => ({
+                before: [isDevelopment && ReactRefreshTypeScript()].filter(
+                  Boolean
+                ),
+              }),
               transpileOnly: isDevelopment,
             },
           },
@@ -200,21 +198,31 @@ var options = {
     }),
     new CopyWebpackPlugin({
       patterns: [
+        // {
+        //   from: "node_modules/tlsn-js/build/7.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
+        // {
+        //   from: "node_modules/tlsn-js/build/250.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
+        // {
+        //   from: "node_modules/tlsn-js/build/278.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
+        // {
+        //   from: "node_modules/tlsn-js/build/349.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
         {
           from: "node_modules/tlsn-js/build",
           to: path.join(__dirname, "build"),
           force: true,
         },
-        {
-          from: "src/assets/plugins/discord_dm.wasm",
-          to: path.join(__dirname, "build"),
-          force: true,
-        },
-        {
-          from: "src/assets/plugins/twitter_profile.wasm",
-          to: path.join(__dirname, "build"),
-          force: true,
-        },
       ],
     }),
     new HtmlWebpackPlugin({

websockify_config

@@ -0,0 +1,6 @@
+api.twitter.com: api.twitter.com:443
+twitter.com: twitter.com:443
+api.reddit.com: api.reddit.com:443
+reddit.com: reddit.com:443
+gateway.reddit.com: gateway.reddit.com:443
+swapi.dev: swapi.dev:443