feat: pass verifier and notary api urls to prover

* feat: added Error for RequestProgress

* feat: added logic to handle errors depending on progress

* chore: linting errors

* fix: linting build error

* Avoid magic numbers

* lint

* feat: alpha.8

* fix: package.json path

* chore: update lockfiles

* fix: notary url

* feat: notarization timeouts

* fix: notarization timeouts

* feat: fixed comments + errors are properly thrown and status changes

* fix: notarization timeouts work properly now

* fix: timeout error message fix

* fix: lint

* fix: lint

* fix: errors should keep state after being thrown now

* chore: lint

* fix: fixing metadata with new progress status

---------

Co-authored-by: Hendrik Eeckhaut <hendrik@eeckhaut.org>
Co-authored-by: tsukino <0xtsukino@gmail.com>

.eslintrc

@@ -31,6 +31,7 @@
     "wasm",
     "tlsn",
     "util",
+    "plugins",
     "webpack.config.js"
   ]
 }

.github/workflows/build.yaml

@@ -1,46 +0,0 @@
-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

@@ -0,0 +1,72 @@
+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: ./tlsn-extension-${{ github.ref_name }}.zip
+
+      - 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

@@ -1,46 +0,0 @@
-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,3 +8,4 @@ bin/
 build
 tlsn/
 zip
+.vscode

README.md

@@ -1,13 +1,35 @@
+![MIT licensed][mit-badge]
+![Apache licensed][apache-badge]
+[![Build Status][actions-badge]][actions-url]
+
+[mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
+[apache-badge]: https://img.shields.io/github/license/saltstack/salt
+[actions-badge]: https://github.com/tlsnotary/tlsn-extension/actions/workflows/build.yaml/badge.svg
+[actions-url]: https://github.com/tlsnotary/tlsn-extension/actions?query=workflow%3Abuild+branch%3Amain++
+
 <img src="src/assets/img/icon-128.png" width="64"/>
 
 # Chrome Extension (MV3) for TLSNotary
 
-### ⚠️ Notice
-- 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
+> [!IMPORTANT]
+> ⚠️ 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
+
+- [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+- [MIT license](http://opensource.org/licenses/MIT)
+
+at your option.
+
 
 ## Installing and Running
 
-### Procedures:
+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:
 
 1. Check if your [Node.js](https://nodejs.org/) version is >= **18**.
 2. Clone this repository.
@@ -24,7 +46,7 @@
 ```
 $ git clone https://github.com/novnc/websockify && cd websockify
 $ ./docker/build.sh
-$ docker run -it --rm -p 55688:80 novnc/websockify 80 api.twitter.com:443
+$ docker run -it --rm -p 55688:80 novnc/websockify 80 api.x.com:443
 ```
 
 ## Running Websockify Docker Image

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsn-extension",
-  "version": "0.1.0.5",
+  "version": "0.1.0.1000",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -16,6 +16,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
+    "@extism/extism": "^2.0.0-rc11",
     "@fortawesome/fontawesome-free": "^6.4.2",
     "async-mutex": "^0.4.0",
     "buffer": "^6.0.3",
@@ -23,9 +24,12 @@
     "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",
@@ -36,7 +40,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2",
     "tailwindcss": "^3.3.3",
-    "tlsn-js": "0.1.0-alpha.5.2"
+    "tlsn-js": "0.1.0-alpha.10.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.12",
@@ -90,4 +94,4 @@
     "webpack-ext-reloader": "^1.1.12",
     "zip-webpack-plugin": "^4.0.1"
   }
-}
+}

src/assets/img/dot-menu.svg

@@ -0,0 +1,2 @@
+<?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

@@ -0,0 +1,70 @@
+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/ErrorModal/index.tsx

@@ -0,0 +1,26 @@
+import React, { ReactElement } from 'react';
+import Modal, { ModalContent } from '../Modal/Modal';
+
+export function ErrorModal(props: {
+  onClose: () => void;
+  message: string;
+}): ReactElement {
+  const { onClose, message } = props;
+
+  return (
+    <Modal
+      className="flex flex-col gap-4 items-center text-base cursor-default justify-center !w-auto mx-4 my-[50%] min-h-24 p-4 border border-red-500 !bg-red-100"
+      onClose={onClose}
+    >
+      <ModalContent className="flex justify-center items-center text-red-500">
+        {message || 'Something went wrong :('}
+      </ModalContent>
+      <button
+        className="m-0 w-24 bg-red-200 text-red-400 hover:bg-red-200 hover:text-red-500"
+        onClick={onClose}
+      >
+        OK
+      </button>
+    </Modal>
+  );
+}

src/components/Menu/index.tsx

@@ -0,0 +1,124 @@
+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
+          fa="fa-solid fa-network-wired"
+          className="border-b border-slate-300"
+          onClick={() => {
+            props.setOpen(false);
+            navigate('/p2p');
+          }}
+        >
+          P2P
+        </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,13 +37,19 @@ 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')}>
+    <div
+      className={classNames(
+        'border-b modal__header border-gray-100',
+        props.className,
+      )}
+    >
       <div className="modal__header__title">{props.children}</div>
       <div className="modal__header__content">
         {props.onClose && (

src/components/PluginInfo/index.scss

@@ -0,0 +1,20 @@
+.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

@@ -0,0 +1,154 @@
+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

@@ -0,0 +1,45 @@
+.plugin-box {
+  &__remove-icon {
+    opacity: 0;
+    height: 0;
+    width: 0;
+    padding: 0;
+    overflow: hidden;
+    transition: 200ms opacity;
+    transition-delay: 200ms;
+  }
+
+  &:hover {
+    .plugin-box__remove-icon {
+      height: 1.25rem;
+      width: 1.25rem;
+      padding: .5rem;
+      opacity: .5;
+
+      &:hover {
+        opacity: 1;
+      }
+    }
+  }
+}
+.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

@@ -0,0 +1,249 @@
+import React, {
+  MouseEventHandler,
+  ReactElement,
+  useCallback,
+  useEffect,
+  useState,
+} from 'react';
+import { fetchPluginHashes, removePlugin, runPlugin } from '../../utils/rpc';
+import { usePluginHashes } from '../../reducers/plugins';
+import {
+  getPluginConfig,
+  hexToArrayBuffer,
+  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,
+}: {
+  className?: string;
+  unremovable?: boolean;
+  onClick?: (hash: string) => void;
+}): ReactElement {
+  const hashes = usePluginHashes();
+
+  useEffect(() => {
+    fetchPluginHashes();
+  }, []);
+
+  return (
+    <div className={classNames('flex flex-col flex-nowrap gap-1', 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}
+        />
+      ))}
+    </div>
+  );
+}
+
+export function Plugin({
+  hash,
+  hex,
+  unremovable,
+  onClick,
+  className,
+}: {
+  hash: string;
+  hex?: string;
+  className?: string;
+  onClick?: (hash: string) => void;
+  unremovable?: boolean;
+}): 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;
+    }
+
+    try {
+      await openSidePanel();
+
+      browser.runtime.sendMessage({
+        type: SidePanelActionTypes.execute_plugin_request,
+        data: {
+          pluginHash: hash,
+        },
+      });
+
+      await runPlugin(hash, 'start');
+
+      window.close();
+    } catch (e: any) {
+      showError(e.message);
+    }
+  }, [hash, config, remove, onClick]);
+
+  useEffect(() => {
+    (async function () {
+      if (hex) {
+        setConfig(await getPluginConfig(hexToArrayBuffer(hex)));
+      } else {
+        setConfig(await getPluginConfigByUrl(hash));
+      }
+    })();
+  }, [hash, hex]);
+
+  const onRemove: MouseEventHandler = useCallback(
+    (e) => {
+      e.stopPropagation();
+      removePlugin(hash);
+      showRemove(false);
+    },
+    [hash, remove],
+  );
+
+  const onConfirmRemove: MouseEventHandler = useCallback(
+    (e) => {
+      e.stopPropagation();
+      showRemove(true);
+    },
+    [hash, remove],
+  );
+
+  const onPluginInfo: MouseEventHandler = useCallback(
+    (e) => {
+      e.stopPropagation();
+      showPluginInfo(true);
+    },
+    [hash, pluginInfo],
+  );
+
+  if (!config) return <></>;
+
+  return (
+    <div
+      className={classNames(
+        'flex flex-row justify-center 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}
+    >
+      {!!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>
+        </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>
+  );
+}

src/components/RequestBuilder/index.tsx

@@ -0,0 +1,154 @@
+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

@@ -17,8 +17,15 @@ import {
 } from 'react-router';
 import Icon from '../Icon';
 import NavigateWithParams from '../NavigateWithParams';
-import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../../utils/storage';
-import { urlify } from '../../utils/misc';
+import {
+  set,
+  get,
+  MAX_SENT_LS_KEY,
+  MAX_RECEIVED_LS_KEY,
+  getMaxRecv,
+  getMaxSent,
+} from '../../utils/storage';
+import { MAX_RECV, MAX_SENT } from '../../utils/constants';
 
 type Props = {
   requestId: string;
@@ -31,7 +38,6 @@ export default function RequestDetail(props: Props): ReactElement {
   const notarize = useCallback(async () => {
     if (!request) return;
 
-    console.log('/notary/' + props.requestId);
     navigate('/notary/' + request.requestId);
   }, [request, props.requestId]);
 
@@ -54,6 +60,9 @@ export default function RequestDetail(props: Props): ReactElement {
         <RequestDetailsHeaderTab path="/response">
           Response
         </RequestDetailsHeaderTab>
+        <RequestDetailsHeaderTab path="/advanced">
+          Advanced
+        </RequestDetailsHeaderTab>
         <button
           className="absolute right-2 bg-primary/[0.9] text-white font-bold px-2 py-0.5 hover:bg-primary/[0.8] active:bg-primary"
           onClick={notarize}
@@ -74,6 +83,7 @@ export default function RequestDetail(props: Props): ReactElement {
           path="response"
           element={<WebResponse requestId={props.requestId} />}
         />
+        <Route path="advanced" element={<AdvancedOptions />} />
         <Route path="/" element={<NavigateWithParams to="/headers" />} />
       </Routes>
     </>
@@ -101,6 +111,62 @@ function RequestDetailsHeaderTab(props: {
   );
 }
 
+function AdvancedOptions(): ReactElement {
+  const [maxSent, setMaxSent] = useState(MAX_SENT);
+  const [maxRecv, setMaxRecv] = useState(MAX_RECV);
+
+  const [dirty, setDirty] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      setMaxRecv((await getMaxRecv()) || MAX_RECV);
+      setMaxSent((await getMaxSent()) || MAX_SENT);
+    })();
+  }, []);
+
+  const onSave = useCallback(async () => {
+    await set(MAX_RECEIVED_LS_KEY, maxRecv.toString());
+    await set(MAX_SENT_LS_KEY, maxSent.toString());
+    setDirty(false);
+  }, [maxSent, maxRecv]);
+
+  return (
+    <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
+      <div className="font-semibold">Max Sent Data</div>
+      <input
+        type="number"
+        className="input border"
+        value={maxSent}
+        min={0}
+        onChange={(e) => {
+          setMaxSent(parseInt(e.target.value));
+          setDirty(true);
+        }}
+      />
+      <div className="font-semibold">Max Received Data</div>
+      <input
+        type="number"
+        className="input border"
+        value={maxRecv}
+        min={0}
+        onChange={(e) => {
+          setMaxRecv(parseInt(e.target.value));
+          setDirty(true);
+        }}
+      />
+      <div className="flex flex-row flex-nowrap justify-end gap-2 p-2">
+        <button
+          className="button !bg-primary/[0.9] hover:bg-primary/[0.8] active:bg-primary !text-white"
+          disabled={!dirty}
+          onClick={onSave}
+        >
+          Save
+        </button>
+      </div>
+    </div>
+  );
+}
+
 function RequestPayload(props: Props): ReactElement {
   const data = useRequest(props.requestId);
   const [url, setUrl] = useState<URL | null>();

src/components/RequestTable/index.tsx

@@ -1,13 +1,21 @@
-import React, { ReactElement, useCallback, useState } from 'react';
+import React, {
+  ReactElement,
+  useCallback,
+  useEffect,
+  useRef,
+  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 {
@@ -47,7 +55,14 @@ export default function RequestTable(props: Props): ReactElement {
 
   return (
     <div className="flex flex-col flex-nowrap flex-grow">
-      <div className="flex flex-row flex-nowrap bg-slate-300 py-1 px-2 gap-2">
+      <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,
+          },
+        )}
+      >
         <input
           className="input w-full"
           type="text"
@@ -61,7 +76,7 @@ export default function RequestTable(props: Props): ReactElement {
           onClick={reset}
         />
       </div>
-      <div className="flex-grow overflow-y-auto h-0">
+      <div className="flex-grow">
         <table className="border border-slate-300 border-collapse table-fixed w-full">
           <thead className="bg-slate-200">
             <tr>

src/components/ResponseDetail/index.tsx

@@ -1,63 +1,15 @@
 import classNames from 'classnames';
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
+import React, { ReactElement } from 'react';
 
 export default function ResponseDetail(props: {
-  response: Response | null;
+  responseData: {
+    json: any | null;
+    text: string | null;
+    img: string | null;
+    headers: [string, string][] | null;
+  } | 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(
@@ -66,7 +18,7 @@ export default function ResponseDetail(props: {
       )}
     >
       <table className="border border-slate-300 border-collapse table-fixed w-full">
-        {!!json && (
+        {!!props.responseData?.json && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -80,13 +32,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(json, null, 2)}
+                  value={JSON.stringify(props.responseData.json, null, 2)}
                 ></textarea>
               </td>
             </tr>
           </>
         )}
-        {!!text && (
+        {!!props.responseData?.text && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -100,13 +52,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={text}
+                  value={props.responseData.text}
                 ></textarea>
               </td>
             </tr>
           </>
         )}
-        {!!img && (
+        {!!props.responseData?.img && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -117,12 +69,12 @@ export default function ResponseDetail(props: {
             </thead>
             <tr>
               <td className="bg-slate-100" colSpan={2}>
-                <img src={img} />
+                <img src={props.responseData.img} />
               </td>
             </tr>
           </>
         )}
-        {!!props.response?.headers && (
+        {!!props.responseData?.headers && (
           <>
             <thead className="bg-slate-200">
               <tr>
@@ -132,20 +84,18 @@ export default function ResponseDetail(props: {
               </tr>
             </thead>
             <tbody>
-              {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>
-                  );
-                },
-              )}
+              {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>
+                );
+              })}
             </tbody>
           </>
         )}

src/entries/Background/cache.ts

@@ -19,6 +19,10 @@ export const getCacheByTabId = (tabId: number): NodeCache => {
   return RequestsLogs[tabId];
 };
 
-export const clearCache = () => {
+export const clearRequestCache = () => {
   RequestsLogs = {};
 };
+
+export const clearCache = () => {
+  clearRequestCache();
+};

src/entries/Background/db.ts

@@ -1,13 +1,46 @@
 import { Level } from 'level';
-import type { RequestHistory } from './rpc';
+import { PluginConfig, PluginMetadata, sha256, urlify } from '../../utils/misc';
+import { RequestHistory, RequestProgress } from './rpc';
+import mutex from './mutex';
+import { minimatch } from 'minimatch';
 const charwise = require('charwise');
 
-const db = new Level('./ext-db', {
+export const db = new Level('./ext-db', {
   valueEncoding: 'json',
 });
 const historyDb = db.sublevel<string, RequestHistory>('history', {
   valueEncoding: 'json',
 });
+const pluginDb = db.sublevel<string, string>('plugin', {
+  valueEncoding: 'hex',
+});
+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 cookiesDb = db.sublevel<string, boolean>('cookies', {
+  valueEncoding: 'json',
+});
+const headersDb = db.sublevel<string, boolean>('headers', {
+  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',
+});
+enum AppDatabaseKey {
+  DefaultPluginsInstalled = 'DefaultPluginsInstalled',
+}
 
 export async function addNotaryRequest(
   now = Date.now(),
@@ -79,9 +112,33 @@ 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 },
+  verification: {
+    sent: string;
+    recv: string;
+    verifierKey: string;
+    notaryKey?: string;
+  },
 ): Promise<RequestHistory | null> {
   const existing = await historyDb.get(id);
 
@@ -120,5 +177,341 @@ export async function getNotaryRequests(): Promise<RequestHistory[]> {
 export async function getNotaryRequest(
   id: string,
 ): Promise<RequestHistory | null> {
-  return historyDb.get(id);
+  return historyDb.get(id).catch(() => null);
+}
+
+export async function getPluginHashes(): Promise<string[]> {
+  const retVal: string[] = [];
+  for await (const [key] of pluginDb.iterator()) {
+    retVal.push(key);
+  }
+  return retVal;
+}
+
+export async function getPluginByUrl(url: string): Promise<string | null> {
+  try {
+    const plugin = await pluginDb.get(url);
+    return plugin;
+  } catch (e) {
+    return null;
+  }
+}
+
+export async function addPlugin(
+  hex: string,
+  url: string,
+): Promise<string | null> {
+  const hash = await sha256(hex);
+
+  if (await getPluginByUrl(url)) {
+    return url;
+  }
+
+  await pluginDb.put(url, hex);
+  return hash;
+}
+
+export async function removePlugin(url: string): Promise<string | null> {
+  const existing = await pluginDb.get(url);
+
+  if (!existing) return null;
+
+  await pluginDb.del(url);
+
+  return url;
+}
+
+export async function getPluginConfigByUrl(
+  url: string,
+): Promise<PluginConfig | null> {
+  try {
+    const config = await pluginConfigDb.get(url);
+    return config;
+  } catch (e) {
+    return null;
+  }
+}
+
+export async function addPluginConfig(
+  url: string,
+  config: PluginConfig,
+): Promise<PluginConfig | null> {
+  if (await getPluginConfigByUrl(url)) {
+    return null;
+  }
+
+  await pluginConfigDb.put(url, config);
+  return config;
+}
+
+export async function removePluginConfig(
+  url: string,
+): Promise<PluginConfig | null> {
+  const existing = await pluginConfigDb.get(url);
+
+  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);
+
+  return existing;
+}
+
+export async function setNotaryRequestCid(
+  id: string,
+  cid: string,
+): Promise<RequestHistory | null> {
+  const existing = await historyDb.get(id);
+
+  if (!existing) return null;
+
+  const newReq = {
+    ...existing,
+    cid,
+  };
+
+  await historyDb.put(id, newReq);
+
+  return newReq;
+}
+
+export async function setConnection(origin: string) {
+  if (await getConnection(origin)) return null;
+  await connectionDb.put(origin, true);
+  return true;
+}
+
+export async function setCookies(host: string, name: string, value: string) {
+  return mutex.runExclusive(async () => {
+    await cookiesDb.sublevel(host).put(name, value);
+    return true;
+  });
+}
+
+export async function clearCookies(host: string) {
+  return mutex.runExclusive(async () => {
+    await cookiesDb.sublevel(host).clear();
+    return true;
+  });
+}
+
+export async function getCookies(link: string, name: string) {
+  try {
+    const existing = await cookiesDb.sublevel(link).get(name);
+    return existing;
+  } catch (e) {
+    return null;
+  }
+}
+
+export async function getCookiesByHost(link: string) {
+  const ret: { [key: string]: string } = {};
+  const links: { [k: string]: boolean } = {};
+  const url = urlify(link);
+
+  for await (const sublevel of cookiesDb.keys({ keyEncoding: 'utf8' })) {
+    const l = sublevel.split('!')[1];
+    links[l] = true;
+  }
+
+  const cookieLink = url
+    ? Object.keys(links).filter((l) => minimatch(l, link))[0]
+    : Object.keys(links).filter((l) => urlify(l)?.host === link)[0];
+
+  if (!cookieLink) return ret;
+
+  for await (const [key, value] of cookiesDb.sublevel(cookieLink).iterator()) {
+    ret[key] = value;
+  }
+  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 setHeaders(link: string, name: string, value?: string) {
+  if (!value) return null;
+  return mutex.runExclusive(async () => {
+    await headersDb.sublevel(link).put(name, value);
+    return true;
+  });
+}
+
+export async function clearHeaders(host: string) {
+  return mutex.runExclusive(async () => {
+    await headersDb.sublevel(host).clear();
+    return true;
+  });
+}
+
+export async function getHeaders(host: string, name: string) {
+  try {
+    const existing = await headersDb.sublevel(host).get(name);
+    return existing;
+  } catch (e) {
+    return null;
+  }
+}
+export async function getHeadersByHost(link: string) {
+  const ret: { [key: string]: string } = {};
+  const url = urlify(link);
+
+  const links: { [k: string]: boolean } = {};
+  for await (const sublevel of headersDb.keys({ keyEncoding: 'utf8' })) {
+    const l = sublevel.split('!')[1];
+    links[l] = true;
+  }
+
+  const headerLink = url
+    ? Object.keys(links).filter((l) => minimatch(l, link))[0]
+    : Object.keys(links).filter((l) => urlify(l)?.host === link)[0];
+
+  if (!headerLink) return ret;
+
+  for await (const [key, value] of headersDb.sublevel(headerLink).iterator()) {
+    ret[key] = 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(),
+  };
 }

src/entries/Background/handlers.ts

@@ -3,7 +3,8 @@ 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 { getHeadersByHost, setCookies, setHeaders } from './db';
 export const onSendHeaders = (
   details: browser.WebRequest.OnSendHeadersDetailsType,
 ) => {
@@ -13,6 +14,28 @@ export const onSendHeaders = (
     if (method !== 'OPTIONS') {
       const cache = getCacheByTabId(tabId);
       const existing = cache.get<RequestLog>(requestId);
+      const { origin, pathname } = urlify(details.url) || {};
+
+      const link = [origin, pathname].join('');
+
+      if (link && details.requestHeaders) {
+        details.requestHeaders.forEach((header) => {
+          const { name, value } = header;
+          if (/^cookie$/i.test(name) && value) {
+            value.split(';').forEach((cookieStr) => {
+              const index = cookieStr.indexOf('=');
+              if (index !== -1) {
+                const cookieName = cookieStr.slice(0, index).trim();
+                const cookieValue = cookieStr.slice(index + 1);
+                setCookies(link, cookieName, cookieValue);
+              }
+            });
+          } else {
+            setHeaders(link, name, value);
+          }
+        });
+      }
+
       cache.set(requestId, {
         ...existing,
         method: details.method as 'GET' | 'POST',

src/entries/Background/index.ts

@@ -1,6 +1,8 @@
 import { onBeforeRequest, onResponseStarted, onSendHeaders } from './handlers';
 import { deleteCacheByTabId } from './cache';
 import browser from 'webextension-polyfill';
+import { getAppState, removePlugin, setDefaultPluginsInstalled } from './db';
+import { installPlugin } from './plugins/utils';
 
 (async () => {
   browser.webRequest.onSendHeaders.addListener(
@@ -31,6 +33,40 @@ import browser from 'webextension-polyfill';
     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

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,463 @@
+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 = () => {
+    console.error('Error connecting to websocket');
+    pushToRedux(setConnected(false));
+  };
+};
+
+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

@@ -0,0 +1,79 @@
+import { ContentScriptTypes, RPCClient } from './rpc';
+import { PresentationJSON } from '../../utils/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;
+  }
+
+  async runPluginWithVerifier(
+    url: string,
+    verifierOptions: {
+      verifierApiUrl: string;
+      proxyApiUrl: string;
+      headers?: { [key: string]: string };
+    },
+    params?: Record<string, string>,
+  ) {
+    const resp = await client.call(ContentScriptTypes.run_plugin_by_url, {
+      url,
+      params,
+      skipConfirmation: true, // Signal to skip confirmation window
+      verifierApiUrl: verifierOptions.verifierApiUrl,
+      proxyApiUrl: verifierOptions.proxyApiUrl,
+      headers: verifierOptions.headers,
+    });
+
+    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,9 +1,119 @@
-window.onerror = (error) => {
-  // console.log('error');
-  // console.log(error);
-};
+import browser, { browserAction } from 'webextension-polyfill';
+import { ContentScriptRequest, ContentScriptTypes, RPCServer } from './rpc';
+import { BackgroundActiontype, RequestHistory } from '../Background/rpc';
+import { urlify } from '../../utils/misc';
 
 (async () => {
-  console.log('Content script works!');
-  console.log('Must reload extension for modifications to take effect.');
+  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;
+    },
+  );
 })();
+
+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

@@ -0,0 +1,122 @@
+import { deferredPromise, PromiseResolvers } from '../../utils/promise';
+
+export interface RunPluginByUrlData {
+  url: string;
+  params?: Record<string, string>;
+  skipConfirmation?: boolean;
+  verifierApiUrl?: string;
+  proxyApiUrl?: string;
+  headers?: { [key: string]: string };
+}
+
+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,95 +1,63 @@
 import React, { useEffect } from 'react';
+import { OffscreenActionTypes } from './types';
+
 import { BackgroundActiontype } from '../Background/rpc';
-import { prove, verify } from 'tlsn-js';
-import { urlify } from '../../utils/misc';
-import browser from 'webextension-polyfill';
+import {
+  initThreads,
+  onCreatePresentationRequest,
+  onCreateProverRequest,
+  onNotarizationRequest,
+  onProcessProveRequest,
+  onVerifyProof,
+  onVerifyProofRequest,
+  startP2PProver,
+  startP2PVerifier,
+} from './rpc';
 
 const Offscreen = () => {
   useEffect(() => {
-    // @ts-ignore
-    chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
-      switch (request.type) {
-        case BackgroundActiontype.process_prove_request: {
-          const {
-            url,
-            method,
-            headers,
-            body = '',
-            maxTranscriptSize,
-            notaryUrl,
-            websocketProxyUrl,
-            id,
-            secretHeaders,
-            secretResps,
-          } = request.data;
-
-          (async () => {
-            try {
-              const token = urlify(url)?.hostname || '';
-              const proof = await prove(url, {
-                method,
-                headers,
-                body,
-                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;
+    (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;
         }
-        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

@@ -0,0 +1,636 @@
+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 { PresentationJSON as PresentationJSONa7 } from 'tlsn-js/build/types';
+import { OffscreenActionTypes } from './types';
+import { PresentationJSON } from '../../utils/types';
+import { waitForEvent } from '../utils';
+import {
+  setNotaryRequestError,
+  setNotaryRequestStatus,
+} from '../Background/db';
+import { getNotaryApi, getProxyApi } from '../../utils/storage';
+
+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,
+    })) as TPresentation;
+    const json = await presentation.json();
+    browser.runtime.sendMessage({
+      type: BackgroundActiontype.finish_prove_request,
+      data: {
+        id,
+        proof: {
+          ...json,
+          meta: {
+            ...json.meta,
+            notaryUrl,
+            websocketProxyUrl,
+          },
+        },
+      },
+    });
+
+    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 {
+    pluginUrl,
+    pluginHex,
+    url,
+    method,
+    headers,
+    body,
+    proverUrl,
+    websocketProxyUrl,
+    maxRecvData,
+    maxSentData,
+    secretHeaders,
+    getSecretResponse,
+  } = request.data;
+
+  const hostname = urlify(url)?.hostname || '';
+
+  const prover: TProver = await new Prover({
+    id: pluginUrl,
+    serverDns: hostname,
+    maxSentData,
+    maxRecvData,
+  });
+
+  browser.runtime.sendMessage({
+    type: BackgroundActiontype.prover_instantiated,
+    data: {
+      pluginUrl,
+    },
+  });
+
+  const proofRequestStart = waitForEvent(
+    OffscreenActionTypes.start_p2p_proof_request,
+  );
+
+  const proverSetup = prover.setup(proverUrl);
+  await new Promise((r) => setTimeout(r, 5000));
+  browser.runtime.sendMessage({
+    type: BackgroundActiontype.prover_setup,
+    data: {
+      pluginUrl,
+    },
+  });
+
+  await proverSetup;
+  browser.runtime.sendMessage({
+    type: BackgroundActiontype.prover_started,
+    data: {
+      pluginUrl,
+    },
+  });
+  await proofRequestStart;
+  await prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
+    url,
+    method,
+    headers,
+    body,
+  });
+
+  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'),
+      ),
+    ),
+  };
+
+  const endRequest = waitForEvent(OffscreenActionTypes.end_p2p_proof_request);
+  await prover.reveal(commit);
+  await endRequest;
+};
+
+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<PresentationJSONa7> {
+  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);
+
+  updateRequestProgress(id, RequestProgress.SendingRequest);
+  await prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
+    url,
+    method,
+    headers,
+    body,
+  });
+
+  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,
+  })) as TPresentation;
+
+  const json = await presentation.json();
+  return {
+    ...json,
+    meta: {
+      ...json,
+      notaryUrl: notaryUrl,
+      websocketProxyUrl: websocketProxyUrl,
+    },
+  };
+}
+
+async function createProver(options: {
+  url: string;
+  verifierApiUrl?: string;
+  proxyApiUrl?: string;
+  notaryUrl?: 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,
+    verifierApiUrl,
+    proxyApiUrl,
+    id,
+  } = options;
+
+  const hostname = urlify(url)?.hostname || '';
+
+  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,
+      async () => {
+        if (verifierApiUrl) {
+          return verifierApiUrl;
+        } else {
+          const notary = NotaryServer.from(
+            options.notaryUrl || (await getNotaryApi()),
+          );
+          return notary.sessionUrl(maxSentData, maxRecvData);
+        }
+      },
+      'Error getting session from Verifier/Notary',
+    );
+
+    await handleProgress(
+      id,
+      RequestProgress.SettingUpProver,
+      () => prover.setup(sessionUrl),
+      'Error setting up prover',
+    );
+
+    const proxyUrl = proxyApiUrl || (await getProxyApi());
+
+    await handleProgress(
+      id,
+      RequestProgress.SendingRequest,
+      () =>
+        prover.sendRequest(proxyUrl + `?token=${hostname}`, {
+          url,
+          method,
+          headers,
+          body,
+        }),
+      'Error sending request',
+    );
+
+    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 undefined:
+    case '0.1.0-alpha.7':
+    case '0.1.0-alpha.8':
+    case '0.1.0-alpha.9':
+      result = {
+        sent: 'version not supported',
+        recv: 'version not supported',
+      };
+      break;
+    case '0.1.0-alpha.10':
+      result = await verify(proof);
+      break;
+  }
+
+  return result!;
+}
+
+async function verify(proof: PresentationJSON) {
+  if (proof.version !== '0.1.0-alpha.10') {
+    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,
+    },
+  });
+}
+
+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) {
+    updateRequestProgress(id, RequestProgress.Error, errorMessage);
+    await setNotaryRequestStatus(id, 'error');
+    await setNotaryRequestError(
+      id,
+      errorMessage || error.message || 'Unknown error',
+    );
+    throw error;
+  }
+}

src/entries/Offscreen/types.ts

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,9 @@
+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.css';
+import './index.scss';
 
 const container = document.getElementById('app-container');
 const root = createRoot(container!); // createRoot(container!) if you use TypeScript

src/entries/Popup/Popup.tsx

@@ -1,14 +1,8 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Navigate, Route, Routes, useNavigate } from 'react-router';
 import { useDispatch } from 'react-redux';
-import {
-  setActiveTab,
-  setRequests,
-  useActiveTab,
-  useActiveTabUrl,
-} from '../../reducers/requests';
+import { setActiveTab, setRequests } 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';
@@ -16,15 +10,23 @@ 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 () => {
@@ -49,8 +51,30 @@ const Popup = () => {
     })();
   }, []);
 
+  useEffect(() => {
+    chrome.runtime.onMessage.addListener((request) => {
+      switch (request.type) {
+        case BackgroundActiontype.push_action: {
+          if (
+            request.data.tabId === store.getState().requests.activeTab?.id ||
+            request.data.tabId === 'background'
+          ) {
+            store.dispatch(request.action);
+          }
+          break;
+        }
+        case BackgroundActiontype.change_route: {
+          if (request.data.tabId === 'background') {
+            navigate(request.route);
+            break;
+          }
+        }
+      }
+    });
+  }, []);
+
   return (
-    <div className="flex flex-col w-full h-full overflow-hidden">
+    <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-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"
@@ -58,15 +82,12 @@ const Popup = () => {
           alt="logo"
           onClick={() => navigate('/')}
         />
-        <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="flex flex-row flex-grow items-center justify-end gap-4">
+          {!isPopup && (
+            <>
+              <MenuIcon />
+            </>
           )}
-          <div className="text-xs">{url?.hostname}</div>
         </div>
       </div>
       <Routes>
@@ -74,11 +95,17 @@ const Popup = () => {
         <Route path="/notary/:requestId" element={<Notarize />} />
         <Route path="/verify/:requestId/*" element={<ProofViewer />} />
         <Route path="/verify" element={<ProofUploader />} />
-        <Route path="/history" element={<History />} />
-        <Route path="/requests" element={<Requests />} />
+        <Route path="/history" element={<Home tab="history" />} />
+        <Route path="/requests" element={<Home tab="network" />} />
         <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>Popup</title>
+    <title>TLSN Extension</title>
   </head>
 
   <body>

src/entries/Popup/index.scss

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

src/entries/Popup/index.tsx

@@ -1,30 +1,19 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 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
 
-chrome.runtime.onMessage.addListener((request) => {
-  switch (request.type) {
-    case BackgroundActiontype.push_action: {
-      if (
-        request.data.tabId === store.getState().requests.activeTab?.id ||
-        request.data.tabId === 'background'
-      ) {
-        store.dispatch(request.action);
-      }
-      break;
-    }
-  }
-});
-
 root.render(
   <Provider store={store}>
     <HashRouter>

src/entries/SidePanel/SidePanel.tsx

@@ -0,0 +1,405 @@
+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 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';
+
+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();
+
+  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: {
+          setConfig(await getPluginConfigByUrl(data.pluginUrl));
+          setUrl(data.pluginUrl);
+          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;
+        }
+      }
+    });
+  }, []);
+
+  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">
+        <img className="h-5" src={logo} alt="logo" />
+        <button
+          className="button absolute right-2"
+          onClick={() => window.close()}
+        >
+          Close
+        </button>
+      </div>
+      {/*{!config && <PluginList />}*/}
+      {started && config && (
+        <PluginBody
+          url={url}
+          hex={hex}
+          config={config}
+          p2p={p2p}
+          clientId={clientId}
+          presetParameterValues={params}
+        />
+      )}
+    </div>
+  );
+}
+
+function PluginBody({
+  url,
+  hex,
+  config,
+  p2p,
+  clientId,
+  presetParameterValues,
+}: {
+  config: PluginConfig;
+  url: string;
+  hex?: string;
+  clientId?: string;
+  p2p?: boolean;
+  presetParameterValues?: Record<string, string>;
+}): ReactElement {
+  const { title, description, icon, steps } = 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],
+  );
+
+  useEffect(() => {
+    if (notaryRequest?.status === 'success') {
+      browser.runtime.sendMessage({
+        type: SidePanelActionTypes.execute_plugin_response,
+        data: {
+          url,
+          proof: notaryRequest.proof,
+        },
+      });
+    } else if (notaryRequest?.status === 'error') {
+      browser.runtime.sendMessage({
+        type: SidePanelActionTypes.execute_plugin_response,
+        data: {
+          url,
+          error: notaryRequest.error,
+        },
+      });
+    }
+  }, [url, notaryRequest?.status]);
+
+  return (
+    <div className="flex flex-col p-4">
+      <div className="flex flex-row items-center gap-4">
+        <img className="w-12 h-12 self-start" src={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 text-base">
+            {title}
+          </div>
+          <div className="text-slate-500 text-sm">{description}</div>
+        </div>
+      </div>
+      <div className="flex flex-col items-start gap-8 mt-8">
+        {steps?.map((step, i) => (
+          <StepContent
+            key={i}
+            url={url}
+            config={config}
+            hex={hex}
+            index={i}
+            setResponse={setResponse}
+            lastResponse={i > 0 ? responses[i - 1] : undefined}
+            responses={responses}
+            p2p={p2p}
+            clientId={clientId}
+            parameterValues={presetParameterValues}
+            {...step}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+function StepContent(
+  props: StepConfig & {
+    url: string;
+    hex?: string;
+    clientId?: string;
+    index: number;
+    setResponse: (resp: any, i: number) => void;
+    responses: any[];
+    lastResponse?: any;
+    config: PluginConfig;
+    p2p?: boolean;
+    parameterValues?: Record<string, string>;
+  },
+): ReactElement {
+  const {
+    index,
+    title,
+    description,
+    cta,
+    action,
+    setResponse,
+    lastResponse,
+    prover,
+    url,
+    hex: _hex,
+    config,
+    p2p = false,
+    clientId = '',
+    parameterValues,
+  } = props;
+  const [completed, setCompleted] = useState(false);
+  const [pending, setPending] = useState(false);
+  const [error, setError] = useState('');
+  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());
+      if (val && prover) {
+        setNotarizationId(val);
+      } else {
+        setCompleted(!!val);
+      }
+      setResponse(val, index);
+    } catch (e: any) {
+      console.error(e);
+      setError(e?.message || 'Unkonwn error');
+    } finally {
+      setPending(false);
+    }
+  }, [action, index, lastResponse, prover, getPlugin]);
+
+  const onClick = useCallback(() => {
+    if (
+      pending ||
+      completed ||
+      notaryRequest?.status === 'pending' ||
+      notaryRequest?.status === 'success'
+    )
+      return;
+    processStep();
+  }, [processStep, pending, completed, notaryRequest]);
+
+  const viewProofInPopup = useCallback(async () => {
+    if (!notaryRequest) return;
+    chrome.runtime.sendMessage<any, string>({
+      type: BackgroundActiontype.verify_prove_request,
+      data: notaryRequest,
+    });
+    await browser.runtime.sendMessage({
+      type: BackgroundActiontype.open_popup,
+      data: {
+        position: {
+          left: window.screen.width / 2 - 240,
+          top: window.screen.height / 2 - 300,
+        },
+        route: `/verify/${notaryRequest.id}`,
+      },
+    });
+  }, [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;
+
+  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) {
+    btnContent = (
+      <button
+        className={classNames(
+          'button mt-2 w-fit flex flex-row flex-nowrap items-center gap-2',
+          '!bg-green-200 !text-black cursor-default border border-green-500 rounded',
+        )}
+      >
+        <Icon className="text-green-600" fa="fa-solid fa-check" />
+        <span className="text-sm">DONE</span>
+      </button>
+    );
+  } else if (notaryRequest?.status === 'success') {
+    btnContent = (
+      <button
+        className={classNames(
+          'button button--primary mt-2 w-fit flex flex-row flex-nowrap items-center gap-2',
+        )}
+        onClick={viewProofInPopup}
+      >
+        <span className="text-sm">View</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-row items-center gap-2 text-red-600">
+            <Icon fa="fa-solid fa-triangle-exclamation" size={1} />
+            <span className="text-sm">
+              {notaryRequest?.errorMessage ||
+                progressText(notaryRequest.progress)}
+            </span>
+          </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>
+    );
+  } else {
+    btnContent = (
+      <button
+        className={classNames(
+          'button mt-2 w-fit flex flex-row flex-nowrap items-center gap-2',
+        )}
+        disabled={index > 0 && typeof lastResponse === 'undefined'}
+        onClick={onClick}
+      >
+        <span className="text-sm">{cta}</span>
+      </button>
+    );
+  }
+
+  return (
+    <div className="flex flex-row gap-4 text-base w-full">
+      <div className="text-slate-500 self-start">{index + 1}.</div>
+      <div className="flex flex-col flex-grow flex-shrink w-0">
+        <div
+          className={classNames('font-semibold', {
+            'line-through text-slate-500': completed,
+          })}
+        >
+          {title}
+        </div>
+        {!!description && (
+          <div className="text-slate-500 text-sm">{description}</div>
+        )}
+        {!!error && <div className="text-red-500 text-sm">{error}</div>}
+        {btnContent}
+      </div>
+    </div>
+  );
+}

src/entries/SidePanel/index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en" width="480px">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Side Panel</title>
+</head>
+
+<body>
+<div id="app-container"></div>
+<div id="modal-root"></div>
+</body>
+</html>

src/entries/SidePanel/index.tsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+import SidePanel from './SidePanel';
+import store from '../../utils/store';
+import { Provider } from 'react-redux';
+import { BackgroundActiontype } from '../Background/rpc';
+
+const container = document.getElementById('app-container');
+const root = createRoot(container!); // createRoot(container!) if you use TypeScript
+
+chrome.runtime.onMessage.addListener((request) => {
+  switch (request.type) {
+    case BackgroundActiontype.push_action: {
+      if (
+        request.data.tabId === store.getState().requests.activeTab?.id ||
+        request.data.tabId === 'background'
+      ) {
+        store.dispatch(request.action);
+      }
+      break;
+    }
+  }
+});
+
+root.render(
+  <Provider store={store}>
+    <SidePanel />
+  </Provider>,
+);

src/entries/SidePanel/sidePanel.scss

@@ -0,0 +1,28 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
+
+@import "../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "../../../node_modules/@fortawesome/fontawesome-free/scss/brands";
+@import "../../../node_modules/@fortawesome/fontawesome-free/scss/solid";
+@import "../../../node_modules/@fortawesome/fontawesome-free/scss/regular";
+@import "../Popup/index.scss";
+
+html {
+  width: 100vw;
+  height: 100vh;
+}
+
+body {
+  padding: 0;
+  margin: 0;
+  width: 100vw;
+  height: 100vh;
+}
+
+#app-container {
+  width: 100vw;
+  height: 100vh;
+}

src/entries/SidePanel/types.ts

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,74 @@
+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,11 +3,16 @@
   "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"
+  },
   "action": {
     "default_popup": "popup.html",
     "default_icon": "icon-34.png"
   },
+  "side_panel": {
+    "default_path": "sidePanel.html"
+  },
   "icons": {
     "128": "icon-128.png"
   },
@@ -23,8 +28,8 @@
   ],
   "web_accessible_resources": [
     {
-      "resources": ["content.styles.css", "icon-128.png", "icon-34.png"],
-      "matches": []
+      "resources": ["content.styles.css", "icon-128.png", "icon-34.png", "content.bundle.js", "discord_dm.wasm", "twitter_profile.wasm"],
+      "matches": ["http://*/*", "https://*/*", "<all_urls>"]
     }
   ],
   "host_permissions": ["<all_urls>"],
@@ -32,6 +37,7 @@
     "offscreen",
     "storage",
     "webRequest",
-    "activeTab"
+    "activeTab",
+    "sidePanel"
   ]
 }

src/pages/BaseApproval/index.tsx

@@ -0,0 +1,44 @@
+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,58 +1,50 @@
 import React, { ReactElement, useState, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router';
-import {
-  useHistoryOrder,
-  useRequestHistory,
-  deleteRequestHistory,
-} from '../../reducers/history';
+import { useHistoryOrder, useRequestHistory } from '../../reducers/history';
 import Icon from '../../components/Icon';
-import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../../utils/storage';
-import { urlify, download, upload } from '../../utils/misc';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
+import NotarizeIcon from '../../assets/img/notarize.png';
+import { urlify } from '../../utils/misc';
+import {
+  BackgroundActiontype,
+  progressText,
+  RequestProgress,
+} from '../../entries/Background/rpc';
 import Modal, { ModalContent } from '../../components/Modal/Modal';
 import classNames from 'classnames';
-import copy from 'copy-to-clipboard';
-import { EXPLORER_API } from '../../utils/constants';
+import dayjs from 'dayjs';
+import RequestMenu from './request-menu';
+
+const charwise = require('charwise');
 
 export default function History(): ReactElement {
   const history = useHistoryOrder();
 
   return (
-    <div className="flex flex-col flex-nowrap overflow-y-auto">
-      {history.map((id) => {
-        return <OneRequestHistory key={id} requestId={id} />;
-      })}
+    <div className="flex flex-col flex-nowrap overflow-y-auto pb-36">
+      {history
+        .map((id) => {
+          return <OneRequestHistory key={id} requestId={id} />;
+        })
+        .reverse()}
     </div>
   );
 }
 
-function OneRequestHistory(props: { requestId: string }): ReactElement {
+export function OneRequestHistory(props: {
+  requestId: string;
+  className?: string;
+  hideActions?: string[];
+}): ReactElement {
+  const { hideActions = [] } = props;
   const dispatch = useDispatch();
   const request = useRequestHistory(props.requestId);
   const [showingError, showError] = useState(false);
-  const [uploadError, setUploadError] = useState('');
-  const [showingShareConfirmation, setShowingShareConfirmation] =
-    useState(false);
-  const [cid, setCid] = useState('');
-  const [uploading, setUploading] = useState(false);
+  const [showingMenu, showMenu] = useState(false);
   const navigate = useNavigate();
   const { status } = request || {};
   const requestUrl = urlify(request?.url || '');
 
-  const onRetry = useCallback(async () => {
-    const notaryUrl = await get(NOTARY_API_LS_KEY);
-    const websocketProxyUrl = await get(PROXY_API_LS_KEY);
-    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,
@@ -61,131 +53,99 @@ function OneRequestHistory(props: { requestId: string }): ReactElement {
     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);
-  }, [setShowingShareConfirmation, showError]);
+  }, [showError]);
 
-  const handleUpload = useCallback(async () => {
-    setUploading(true);
-    try {
-      const data = await upload(
-        `${request?.id}.json`,
-        JSON.stringify(request?.proof),
-      );
-      setCid(data);
-    } catch (e: any) {
-      setUploadError(e.message);
-    } finally {
-      setUploading(false);
-    }
-  }, []);
+  const day = dayjs(charwise.decode(props.requestId, 'hex'));
 
   return (
-    <div className="flex flex-row flex-nowrap border rounded-md p-2 gap-1 hover:bg-slate-50 cursor-pointer">
-      <ShareConfirmationModal />
+    <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();
+      }}
+    >
       <ErrorModal />
-      <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 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>
-        <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
+          className={classNames('font-semibold px-2 rounded-sm w-fit', {
+            'text-green-600': status === 'success',
+            'text-red-600': status === 'error',
+          })}
+        >
+          {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 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}
-        >
-          <Icon className="" fa="fa-solid fa-trash" size={1} />
-          <span className="text-xs font-bold">Delete</span>
-        </button>
+      <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>
       </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 ? (
       <></>
     ) : (
@@ -194,7 +154,7 @@ function OneRequestHistory(props: { requestId: string }): ReactElement {
         onClose={closeAllModal}
       >
         <ModalContent className="flex justify-center items-center text-slate-500">
-          {request?.error || 'Something went wrong :('}
+          {msg || request?.errorMessage}
         </ModalContent>
         <button
           className="m-0 w-24 bg-red-100 text-red-300 hover:bg-red-200 hover:text-red-500"
@@ -205,94 +165,4 @@ function OneRequestHistory(props: { requestId: string }): ReactElement {
       </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 ? (
-            <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}`}
-              onFocus={(e) => e.target.select()}
-            />
-          )}
-        </ModalContent>
-        <div className="flex flex-row gap-2 justify-center">
-          {!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={closeAllModal}
-              >
-                Close
-              </button>
-            </>
-          ) : (
-            <>
-              <button
-                onClick={() => copy(`${EXPLORER_API}/ipfs/${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={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

@@ -0,0 +1,307 @@
+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

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

src/pages/Home/index.tsx

@@ -1,207 +1,104 @@
 import React, {
   MouseEventHandler,
   ReactElement,
-  ReactNode,
-  useCallback,
+  useEffect,
+  useRef,
   useState,
 } from 'react';
-import Icon from '../../components/Icon';
 import classNames from 'classnames';
-import { useNavigate } from 'react-router';
-import {
-  notarizeRequest,
-  useActiveTabUrl,
-  useRequests,
-} from '../../reducers/requests';
-import { Link } from 'react-router-dom';
-import bookmarks from '../../../utils/bookmark/bookmarks.json';
-import { replayRequest, urlify } from '../../utils/misc';
-import { useDispatch } from 'react-redux';
-import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../../utils/storage';
+import { ErrorModal } from '../../components/ErrorModal';
+import History from '../History';
+import './index.scss';
+import Requests from '../Requests';
+import { fetchPluginHashes } from '../../utils/rpc';
 
-export default function Home(): ReactElement {
-  const requests = useRequests();
-  const url = useActiveTabUrl();
-  const navigate = useNavigate();
-  const dispatch = useDispatch();
+export default function Home(props: {
+  tab?: 'history' | 'network';
+}): ReactElement {
+  const [error, showError] = useState('');
+  const [tab, setTab] = useState<'history' | 'network'>(props.tab || 'history');
+  const scrollableContent = useRef<HTMLDivElement | null>(null);
+  const [shouldFix, setFix] = useState(false);
+
+  useEffect(() => {
+    fetchPluginHashes();
+  }, []);
+
+  useEffect(() => {
+    const element = scrollableContent.current;
+    if (!element) return;
+
+    const onScroll = () => {
+      if (element.scrollTop > 0) {
+        setFix(true);
+      } else {
+        setFix(false);
+      }
+    };
+
+    element.addEventListener('scroll', onScroll);
+
+    return () => {
+      element.removeEventListener('scroll', onScroll);
+    };
+  }, [scrollableContent]);
 
   return (
-    <div className="flex flex-col gap-4 py-4 overflow-y-auto">
-      <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-magnifying-glass"
-          onClick={() => navigate('/custom')}
+    <div
+      id="home"
+      ref={scrollableContent}
+      className="flex flex-col flex-grow 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'}
         >
-          Custom
-        </NavButton>
-        <NavButton
-          fa="fa-solid fa-magnifying-glass"
-          onClick={() => navigate('/verify')}
+          Network
+        </TabSelector>
+        <TabSelector
+          onClick={() => setTab('history')}
+          selected={tab === 'history'}
         >
-          Verify
-        </NavButton>
-        <NavButton fa="fa-solid fa-list" onClick={() => navigate('/history')}>
           History
-        </NavButton>
-        <NavButton fa="fa-solid fa-gear" onClick={() => navigate('/options')}>
-          Options
-        </NavButton>
+        </TabSelector>
       </div>
-      {!bookmarks.length && (
-        <div className="flex flex-col flex-nowrap">
-          <div className="flex flex-col items-center justify-center text-slate-300 cursor-default select-none">
-            <div>No available notarization for {url?.hostname}</div>
-            <div>
-              Browse <Link to="/requests">Requests</Link>
-            </div>
-          </div>
-        </div>
-      )}
-      <div className="flex flex-col px-4 gap-4">
-        {bookmarks.map((bm, i) => {
-          try {
-            const reqs = requests.filter((req) => {
-              return req?.url?.includes(bm.url);
-            });
-
-            const bmHost = urlify(bm.targetUrl)?.host;
-            const isReady = !!reqs.length;
-
-            return (
-              <div
-                key={i}
-                className="flex flex-col flex-nowrap border rounded-md p-2 gap-1 hover:bg-slate-50 cursor-pointer"
-              >
-                <div className="flex flex-row items-center text-xs">
-                  <div className="bg-slate-200 text-slate-400 px-1 py-0.5 rounded-sm">
-                    {bm.method}
-                  </div>
-                  <div className="text-slate-400 px-2 py-1 rounded-md">
-                    {bm.type}
-                  </div>
-                </div>
-                <div className="font-bold">{bm.title}</div>
-                <div className="italic">{bm.description}</div>
-                {isReady && (
-                  <button
-                    className="button button--primary w-fit self-end mt-2"
-                    onClick={async () => {
-                      if (!isReady) return;
-
-                      const req = reqs[0];
-                      const res = await replayRequest(req);
-                      const secretHeaders = req.requestHeaders
-                        .map((h) => {
-                          return (
-                            `${h.name.toLowerCase()}: ${h.value || ''}` || ''
-                          );
-                        })
-                        .filter((d) => !!d);
-                      const selectedValue = res.match(
-                        new RegExp(bm.responseSelector, 'g'),
-                      );
-
-                      if (selectedValue) {
-                        const revealed = bm.valueTransform.replace(
-                          '%s',
-                          selectedValue[0],
-                        );
-                        const selectionStart = res.indexOf(revealed);
-                        const selectionEnd =
-                          selectionStart + revealed.length - 1;
-                        const secretResps = [
-                          res.substring(0, selectionStart),
-                          res.substring(selectionEnd, res.length),
-                        ].filter((d) => !!d);
-
-                        const hostname = urlify(req.url)?.hostname;
-                        const notaryUrl = await get(NOTARY_API_LS_KEY);
-                        const websocketProxyUrl = await get(PROXY_API_LS_KEY);
-
-                        const headers: { [k: string]: string } =
-                          req.requestHeaders.reduce(
-                            (acc: any, h) => {
-                              acc[h.name] = h.value;
-                              return acc;
-                            },
-                            { Host: hostname },
-                          );
-
-                        //TODO: for some reason, these needs to be override to work
-                        headers['Accept-Encoding'] = 'identity';
-                        headers['Connection'] = 'close';
-
-                        dispatch(
-                          // @ts-ignore
-                          notarizeRequest({
-                            url: req.url,
-                            method: req.method,
-                            headers: headers,
-                            body: req.requestBody,
-                            maxTranscriptSize: 16384,
-                            notaryUrl,
-                            websocketProxyUrl,
-                            secretHeaders,
-                            secretResps,
-                          }),
-                        );
-
-                        navigate(`/history`);
-                      }
-                    }}
-                  >
-                    Notarize
-                  </button>
-                )}
-                {!isReady && (
-                  <button
-                    className="button w-fit self-end mt-2"
-                    onClick={() => chrome.tabs.update({ url: bm.targetUrl })}
-                  >
-                    {`Go to ${bmHost}`}
-                  </button>
-                )}
-              </div>
-            );
-          } catch (e) {
-            return null;
-          }
-        })}
+      <div className="flex-grow">
+        {tab === 'history' && <History />}
+        {tab === 'network' && <Requests shouldFix={shouldFix} />}
       </div>
     </div>
   );
 }
 
-function NavButton(props: {
-  fa: string;
-  children?: ReactNode;
-  onClick?: MouseEventHandler;
+function TabSelector(props: {
+  children: string;
   className?: string;
-  disabled?: boolean;
+  selected?: boolean;
+  onClick: MouseEventHandler;
 }): ReactElement {
   return (
     <button
+      onClick={props.onClick}
       className={classNames(
-        'flex flex-row flex-nowrap items-center justify-center',
-        'text-white rounded px-2 py-1 gap-1',
+        'flex flex-grow items-center justify-center p-2 font-semibold hover:text-slate-700 border-b-2 ',
         {
-          'bg-primary/[.8] hover:bg-primary/[.7] active:bg-primary':
-            !props.disabled,
-          'bg-primary/[.5]': props.disabled,
+          'font-semibold text-slate-400 border-white': !props.selected,
+          'font-bold text-primary border-primary': props.selected,
         },
         props.className,
       )}
-      onClick={props.onClick}
-      disabled={props.disabled}
     >
-      <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>
+      {props.children}
     </button>
   );
 }

src/pages/Notarize/index.tsx

@@ -1,22 +1,25 @@
 import classNames from 'classnames';
 import React, {
-  ReactNode,
   ReactElement,
   useState,
   useCallback,
   ReactEventHandler,
   useEffect,
   useRef,
+  useMemo,
 } from 'react';
-import { useLocation, useNavigate, useParams } from 'react-router';
+import { 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 } from '../../utils/storage';
+import {
+  getNotaryApi,
+  getProxyApi,
+  getMaxSent,
+  getMaxRecv,
+} 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);
@@ -29,9 +32,10 @@ export default function Notarize(): ReactElement {
   const notarize = useCallback(async () => {
     if (!req) return;
     const hostname = urlify(req.url)?.hostname;
-    const notaryUrl = await get(NOTARY_API_LS_KEY);
-    const websocketProxyUrl = await get(PROXY_API_LS_KEY);
-
+    const notaryUrl = await getNotaryApi();
+    const websocketProxyUrl = await getProxyApi();
+    const maxSentData = await getMaxSent();
+    const maxRecvData = await getMaxRecv();
     const headers: { [k: string]: string } = req.requestHeaders.reduce(
       (acc: any, h) => {
         acc[h.name] = h.value;
@@ -51,7 +55,8 @@ export default function Notarize(): ReactElement {
         method: req.method,
         headers,
         body: req.requestBody,
-        maxTranscriptSize,
+        maxSentData,
+        maxRecvData,
         notaryUrl,
         websocketProxyUrl,
         secretHeaders,
@@ -114,7 +119,7 @@ export default function Notarize(): ReactElement {
   );
 }
 
-function RevealHeaderStep(props: {
+export function RevealHeaderStep(props: {
   onNext: () => void;
   onCancel: () => void;
   setSecretHeaders: (secrets: string[]) => void;
@@ -123,13 +128,14 @@ function RevealHeaderStep(props: {
   const req = useRequest(params.requestId);
   const [revealed, setRevealed] = useState<{ [key: string]: boolean }>({});
 
+  const headers = req?.requestHeaders;
+
   useEffect(() => {
     if (!req) return;
 
     props.setSecretHeaders(
       req.requestHeaders
         .map((h) => {
-          console.log(h.name, !revealed[h.name]);
           if (!revealed[h.name]) {
             return `${h.name.toLowerCase()}: ${h.value || ''}` || '';
           }
@@ -151,21 +157,21 @@ function RevealHeaderStep(props: {
     [revealed, req],
   );
 
-  if (!req) return <></>;
+  if (!headers) 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">
-            {req.requestHeaders?.map((h) => (
+            {headers.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">
@@ -173,14 +179,14 @@ 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('*')
@@ -206,34 +212,146 @@ function RevealHeaderStep(props: {
   );
 }
 
-function HideResponseStep(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: {
   onNext: () => void;
   onCancel: () => void;
   setSecretResps: (secrets: string[]) => void;
-}): ReactElement {
+}): React.ReactElement {
   const params = useParams<{ requestId: string }>();
   const req = useRequest(params.requestId);
   const [responseText, setResponseText] = useState('');
-  const [start, setStart] = useState(0);
-  const [end, setEnd] = useState(0);
+  const [redactedRanges, setRedactedRanges] = useState<
+    { start: number; end: number }[]
+  >([]);
+  const [isRedactMode, setIsRedactMode] = useState(true);
   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);
-        props.setSecretResps(
-          [
-            responseText.substring(0, ta.selectionStart),
-            responseText.substring(ta.selectionEnd, responseText.length),
-          ].filter((d) => !!d),
-        );
+  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]);
       }
-    },
-    [responseText],
-  );
+    }
+
+    return mergedRanges;
+  };
 
   useEffect(() => {
     if (!req) return;
@@ -269,36 +387,46 @@ function HideResponseStep(props: {
 
     if (current) {
       current.focus();
-      current.setSelectionRange(start, end);
     }
-  }, [taRef, start, end]);
+  }, [taRef]);
 
   if (!req) return <></>;
 
-  let shieldedText = '';
+  const shieldedText = responseText.split('');
+  redactedRanges.forEach(({ start, end }) => {
+    for (let i = start; i < end; i++) {
+      shieldedText[i] = '*';
+    }
+  });
 
-  if (end > start) {
-    shieldedText = Array(start)
-      .fill('*')
-      .join('')
-      .concat(responseText.substring(start, end))
-      .concat(
-        Array(responseText.length - end)
-          .fill('*')
-          .join(''),
-      );
-  }
   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
+        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 || responseText}
-          onSelect={onSelectionChange}
+          value={shieldedText.join('')}
+          onMouseUp={onSelectionChange}
         />
       </div>
       <div className="flex flex-row justify-end p-2 gap-2 border-t">
@@ -316,6 +444,112 @@ function HideResponseStep(props: {
   );
 }
 
+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;
+
+    if (current) {
+      current.focus();
+      current.setSelectionRange(start, end);
+    }
+  }, [taRef, start, end]);
+
+  let shieldedText = '';
+
+  if (end > start) {
+    shieldedText = Array(start)
+      .fill('*')
+      .join('')
+      .concat(responseText.substring(start, end))
+      .concat(
+        Array(responseText.length - end)
+          .fill('*')
+          .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}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <textarea
+      ref={taRef}
+      className={classNames(
+        'flex-grow textarea bg-slate-100 font-mono',
+        className,
+      )}
+      value={shieldedText || responseText}
+      onSelect={onSelectionChange}
+    />
+  );
+}
+
 const replay = async (url: string, options: any) => {
   const resp = await fetch(url, options);
   const contentType =

src/pages/NotarizeApproval/index.tsx

@@ -0,0 +1,178 @@
+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

@@ -1,60 +1,173 @@
-import React, { ReactElement, useState, useEffect, useCallback } from 'react';
+import React, {
+  ReactElement,
+  useState,
+  useEffect,
+  useCallback,
+  MouseEvent,
+} from 'react';
 import {
   set,
-  get,
   NOTARY_API_LS_KEY,
   PROXY_API_LS_KEY,
+  MAX_SENT_LS_KEY,
+  MAX_RECEIVED_LS_KEY,
+  getMaxSent,
+  getMaxRecv,
+  getNotaryApi,
+  getProxyApi,
+  getLoggingFilter,
+  LOGGING_FILTER_KEY,
+  getRendezvousApi,
+  RENDEZVOUS_API_LS_KEY,
 } from '../../utils/storage';
+import {
+  EXPLORER_API,
+  NOTARY_API,
+  NOTARY_PROXY,
+  MAX_RECV,
+  MAX_SENT,
+  RENDEZVOUS_API,
+} 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';
 
 export default function Options(): ReactElement {
-  const [notary, setNotary] = useState('https://notary.pse.dev/v0.1.0-alpha.5');
-  const [proxy, setProxy] = useState('wss://notary.pse.dev/proxy');
+  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 [dirty, setDirty] = useState(false);
+  const [shouldReload, setShouldReload] = useState(false);
+  const [advanced, setAdvanced] = useState(false);
+  const [showReloadModal, setShowReloadModal] = useState(false);
 
   useEffect(() => {
     (async () => {
-      setNotary(await get(NOTARY_API_LS_KEY));
-      setProxy(await get(PROXY_API_LS_KEY));
+      setNotary(await getNotaryApi());
+      setProxy(await getProxyApi());
     })();
   }, []);
 
-  const onSave = useCallback(async () => {
-    await set(NOTARY_API_LS_KEY, notary);
-    await set(PROXY_API_LS_KEY, proxy);
-    setDirty(false);
-  }, [notary, proxy]);
+  useEffect(() => {
+    (async () => {
+      setMaxReceived((await getMaxRecv()) || MAX_RECV);
+      setMaxSent((await getMaxSent()) || MAX_SENT);
+      setLoggingLevel((await getLoggingFilter()) || 'Info');
+      setRendezvous((await getRendezvousApi()) || RENDEZVOUS_API);
+    })();
+  }, [advanced]);
+
+  const onSave = useCallback(
+    async (e: MouseEvent<HTMLButtonElement>, skipCheck = false) => {
+      if (!skipCheck && shouldReload) {
+        setShowReloadModal(true);
+        return;
+      }
+      await set(NOTARY_API_LS_KEY, notary);
+      await set(PROXY_API_LS_KEY, proxy);
+      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);
+      setDirty(false);
+    },
+    [
+      notary,
+      proxy,
+      maxSent,
+      maxReceived,
+      loggingLevel,
+      rendezvous,
+      shouldReload,
+    ],
+  );
+
+  const onSaveAndReload = useCallback(
+    async (e: MouseEvent<HTMLButtonElement>) => {
+      await onSave(e, true);
+      browser.runtime.reload();
+    },
+    [onSave],
+  );
+
+  const onAdvanced = useCallback(() => {
+    setAdvanced(!advanced);
+  }, [advanced]);
+
+  const openInTab = useCallback((url: string) => {
+    browser.tabs.create({ url });
+  }, []);
 
   return (
-    <div className="flex flex-col flex-nowrap flex-grow">
-      <div className="flex flex-row flex-nowrap py-1 px-2 gap-2 font-bold text-base">
-        Settings
+    <div className="flex flex-col flex-nowrap flex-grow overflow-y-auto">
+      {showReloadModal && (
+        <Modal
+          className="flex flex-col items-center text-base cursor-default justify-center !w-auto mx-4 my-[50%] p-4 gap-4"
+          onClose={() => setShowReloadModal(false)}
+        >
+          <ModalContent className="flex flex-col w-full gap-4 items-center text-base justify-center">
+            Modifying your logging your will require your extension to reload.
+            Do you want to proceed?
+          </ModalContent>
+          <div className="flex flex-row justify-end items-center gap-2 w-full">
+            <button
+              className="button"
+              onClick={() => setShowReloadModal(false)}
+            >
+              No
+            </button>
+            <button
+              className="button button--primary"
+              onClick={onSaveAndReload}
+            >
+              Yes
+            </button>
+          </div>
+        </Modal>
+      )}
+      <div className="flex flex-row flex-nowrap justify-between items-between py-1 px-2 gap-2">
+        <p className="font-bold text-base">Settings</p>
       </div>
-      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
-        <div className="font-semibold">Notary API</div>
-        <input
-          type="text"
-          className="input border"
-          placeholder="http://localhost:7047"
-          onChange={(e) => {
-            setNotary(e.target.value);
-            setDirty(true);
-          }}
-          value={notary}
+      <NormalOptions
+        notary={notary}
+        setNotary={setNotary}
+        proxy={proxy}
+        setProxy={setProxy}
+        setDirty={setDirty}
+      />
+      <div className="justify-left px-2 pt-3 gap-2">
+        <button className="font-bold" onClick={onAdvanced}>
+          <i
+            className={
+              advanced
+                ? 'fa-solid fa-caret-down pr-1'
+                : 'fa-solid fa-caret-right pr-1'
+            }
+          ></i>
+          Advanced
+        </button>
+      </div>
+      {!advanced ? (
+        <></>
+      ) : (
+        <AdvancedOptions
+          maxSent={maxSent}
+          setMaxSent={setMaxSent}
+          maxReceived={maxReceived}
+          setMaxReceived={setMaxReceived}
+          setDirty={setDirty}
+          loggingLevel={loggingLevel}
+          setLoggingLevel={setLoggingLevel}
+          setShouldReload={setShouldReload}
+          rendezvous={rendezvous}
+          setRendezvous={setRendezvous}
         />
-      </div>
-      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
-        <div className="font-semibold">Proxy API</div>
-        <input
-          type="text"
-          className="input border"
-          placeholder="ws://127.0.0.1:55688"
-          onChange={(e) => {
-            setProxy(e.target.value);
-            setDirty(true);
-          }}
-          value={proxy}
-        />
-      </div>
+      )}
       <div className="flex flex-row flex-nowrap justify-end gap-2 p-2">
         <button
           className="button !bg-primary/[0.9] hover:bg-primary/[0.8] active:bg-primary !text-white"
@@ -64,6 +177,169 @@ 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>
+      </div>
+    </div>
+  );
+}
+
+function InputField(props: {
+  label?: string;
+  placeholder?: string;
+  value?: string;
+  type?: string;
+  min?: number;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}) {
+  const { label, placeholder, value, type, min, onChange } = props;
+
+  return (
+    <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
+      <div className="font-semibold cursor-default">{label}</div>
+      <input
+        type={type}
+        className="input border"
+        onChange={onChange}
+        value={value}
+        min={min}
+        placeholder={placeholder}
+      />
+    </div>
+  );
+}
+
+function NormalOptions(props: {
+  notary: string;
+  setNotary: (value: string) => void;
+  proxy: string;
+  setProxy: (value: string) => void;
+  setDirty: (value: boolean) => void;
+}) {
+  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"
+        value={notary}
+        type="text"
+        onChange={(e) => {
+          setNotary(e.target.value);
+          setDirty(true);
+        }}
+      />
+      <InputField
+        label="Proxy API"
+        placeholder="https://proxy.tlsnotary.org"
+        value={proxy}
+        type="text"
+        onChange={(e) => {
+          setProxy(e.target.value);
+          setDirty(true);
+        }}
+      />
+      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2 cursor-default">
+        <div className="font-semibold">Explorer URL</div>
+        <div className="input border bg-slate-100">{EXPLORER_API}</div>
+      </div>
+    </div>
+  );
+}
+
+function AdvancedOptions(props: {
+  maxSent: number;
+  maxReceived: number;
+  loggingLevel: LoggingLevel;
+  rendezvous: 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;
+}) {
+  const {
+    maxSent,
+    setMaxSent,
+    maxReceived,
+    setMaxReceived,
+    setDirty,
+    setLoggingLevel,
+    loggingLevel,
+    setShouldReload,
+    rendezvous,
+    setRendezvous,
+  } = props;
+
+  return (
+    <div>
+      <InputField
+        label="Set Max Received Data"
+        value={maxReceived.toString()}
+        type="number"
+        min={0}
+        onChange={(e) => {
+          setMaxReceived(parseInt(e.target.value));
+          setDirty(true);
+        }}
+      />
+      <InputField
+        label="Set Max Sent Data"
+        value={maxSent.toString()}
+        type="number"
+        min={0}
+        onChange={(e) => {
+          setMaxSent(parseInt(e.target.value));
+          setDirty(true);
+        }}
+      />
+      <InputField
+        label="Rendezvous API (for P2P)"
+        value={rendezvous}
+        type="text"
+        onChange={(e) => {
+          setRendezvous(e.target.value);
+          setDirty(true);
+        }}
+      />
+      <div className="flex flex-col flex-nowrap py-1 px-2 gap-2">
+        <div className="font-semibold">Logging Level</div>
+        <select
+          className="select !bg-white border !px-2 !py-1"
+          onChange={(e) => {
+            setLoggingLevel(e.target.value as LoggingLevel);
+            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>
+        </select>
+      </div>
+      <div className="flex flex-row flex-nowrap justify-end gap-2 p-2"></div>
     </div>
   );
 }

src/pages/PeerToPeer/index.tsx

@@ -0,0 +1,497 @@
+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

@@ -0,0 +1,10 @@
+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,13 +7,17 @@ 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
@@ -25,16 +29,32 @@ export default function ProofUploader(): ReactElement {
           const result = event.target?.result;
           if (result) {
             const proof = JSON.parse(result as string);
-            const res = await chrome.runtime.sendMessage<
-              any,
-              { recv: string; sent: string }
-            >({
-              type: BackgroundActiontype.verify_proof,
-              data: proof,
-            });
-            setProof(res);
+            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);
+            }
           }
         });
+
+        setUploading(true);
         reader.readAsText(file);
       }
     },
@@ -42,7 +62,15 @@ export default function ProofUploader(): ReactElement {
   );
 
   if (proof) {
-    return <ProofViewer recv={proof.recv} sent={proof.sent} />;
+    return (
+      <ProofViewer
+        recv={proof.recv}
+        sent={proof.sent}
+        verifierKey={proof.verifierKey}
+        notaryKey={proof.notaryKey}
+        info={metadata}
+      />
+    );
   }
 
   return (
@@ -53,16 +81,23 @@ 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}
         />
-        <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>
+        {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>
+          </>
+        )}
       </div>
     </div>
   );

src/pages/ProofViewer/index.tsx

@@ -2,41 +2,99 @@ import React, {
   ReactNode,
   ReactElement,
   useState,
+  useEffect,
   MouseEventHandler,
+  useCallback,
 } from 'react';
 import { useParams, useNavigate } from 'react-router';
 import c from 'classnames';
-import { useRequestHistory } from '../../reducers/history';
+import {
+  deleteRequestHistory,
+  useRequestHistory,
+} from '../../reducers/history';
 import Icon from '../../components/Icon';
-import { download } from '../../utils/misc';
+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';
 
 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="flex flex-col w-full py-2 gap-2 flex-grow">
+    <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 px-2">
         <div className="flex flex-row gap-2 items-center">
-          <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"
-          />
+          {!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"
+            />
+          )}
           <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
@@ -49,6 +107,12 @@ export default function ProofViewer(props?: {
                 Download
               </button>
             )}
+            <button
+              className="button !text-red-500"
+              onClick={() => setShowRemoveModal(true)}
+            >
+              Delete
+            </button>
           </div>
         </div>
       </div>
@@ -57,19 +121,71 @@ 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;
@@ -88,3 +204,20 @@ 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,6 +11,20 @@ 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',
@@ -25,25 +39,33 @@ 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 [headers, setHeaders] = useState<[string, string, boolean?][]>(
-    props?.headers || [],
-  );
   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 [response, setResponse] = useState<Response | null>(
-    props?.response || null,
+  const [type, setType] = useState<string>('text/plain');
+  const [headers, setHeaders] = useState<[string, string, boolean?][]>(
+    props?.headers || [['Content-Type', type, true]],
   );
 
+  const [responseData, setResponseData] = useState<{
+    json: any | null;
+    text: string | null;
+    img: string | null;
+    headers: [string, string][] | null;
+  } | null>(null);
+
   const url = urlify(_url);
 
   const href = !url
@@ -57,6 +79,26 @@ 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];
@@ -91,7 +133,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,
@@ -102,9 +144,13 @@ export default function RequestBuilder(props?: {
         return map;
       }, {}),
     };
-
-    if (body) opts.body = body;
-
+    if (method !== 'GET' && method !== 'HEAD') {
+      if (type === 'application/x-www-form-urlencoded') {
+        opts.body = formatForRequest(formBody, type);
+      } else {
+        opts.body = formatForRequest(body!, type);
+      }
+    }
     const cookie = headers.find(([key]) => key === 'Cookie');
 
     if (cookie) {
@@ -114,15 +160,64 @@ export default function RequestBuilder(props?: {
 
     const res = await fetch(href, opts);
 
-    setResponse(res);
+    const contentType =
+      res.headers.get('content-type') || res.headers.get('Content-Type');
+
+    setResponseData(await parseResponse(contentType!, res));
 
     navigate(subpath + '/response');
-  }, [href, method, headers, body]);
+  }, [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],
+  );
 
   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) => setMethod(e.target.value)}>
+        <select className="select" onChange={(e) => onMethod(e)}>
           <option value="GET">GET</option>
           <option value="POST">POST</option>
           <option value="PUT">PUT</option>
@@ -134,8 +229,14 @@ export default function RequestBuilder(props?: {
         <input
           className="input border flex-grow"
           type="text"
-          value={url ? href : _url}
+          value={_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
@@ -161,13 +262,19 @@ export default function RequestBuilder(props?: {
           >
             Body
           </TabLabel>
-          {response && (
-            <TabLabel
-              onClick={() => navigate(subpath + '/response')}
-              active={loc.pathname.includes('response')}
-            >
-              Response
-            </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>
           )}
         </div>
       </div>
@@ -197,16 +304,38 @@ export default function RequestBuilder(props?: {
           <Route
             path="body"
             element={
-              <textarea
-                className="textarea h-full w-full resize-none"
-                value={body}
-                onChange={(e) => setBody(e.target.value)}
-              />
+              <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>
             }
           />
           <Route
             path="response"
-            element={<ResponseDetail response={response} />}
+            element={<ResponseDetail responseData={responseData} />}
           />
           <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(): ReactElement {
+export default function Requests(props: { shouldFix?: boolean }): ReactElement {
   const requests = useRequests();
   return (
     <>
-      <RequestTable requests={requests} />
+      <RequestTable shouldFix={props.shouldFix} requests={requests} />
     </>
   );
 }

src/pages/RunPluginByUrlApproval/index.tsx

@@ -0,0 +1,148 @@
+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,6 +1,7 @@
 import {
   BackgroundActiontype,
   RequestHistory,
+  RequestProgress,
 } from '../entries/Background/rpc';
 import { useSelector } from 'react-redux';
 import { AppRootState } from './index';
@@ -8,7 +9,9 @@ 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> = {
@@ -37,6 +40,20 @@ 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,
@@ -60,6 +77,9 @@ 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,
@@ -72,6 +92,25 @@ 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 };
@@ -83,6 +122,20 @@ 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;
   }
@@ -94,6 +147,12 @@ 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

@@ -1,10 +1,14 @@
 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

@@ -0,0 +1,375 @@
+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

@@ -0,0 +1,67 @@
+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',
+  '/plugin/removePlugin' = '/plugin/removePlugin',
+}
+
+type Action<payload> = {
+  type: ActionType;
+  payload?: payload;
+  error?: boolean;
+  meta?: any;
+};
+
+type State = {
+  order: string[];
+};
+
+const initState: State = {
+  order: [],
+};
+
+export const addOnePlugin = (hash: string): Action<string> => ({
+  type: ActionType['/plugin/addPlugin'],
+  payload: hash,
+});
+
+export const removeOnePlugin = (hash: string): Action<string> => ({
+  type: ActionType['/plugin/removePlugin'],
+  payload: hash,
+});
+
+export default function plugins(state = initState, action: Action<any>): State {
+  switch (action.type) {
+    case ActionType['/plugin/addPlugin']:
+      return {
+        order: [...new Set(state.order.concat(action.payload))],
+      };
+    case ActionType['/plugin/removePlugin']:
+      return {
+        order: state.order.filter((h) => h !== action.payload),
+      };
+    default:
+      return state;
+  }
+}
+
+export const usePluginHashes = (): string[] => {
+  return useSelector((state: AppRootState) => {
+    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

@@ -5,7 +5,12 @@ import {
 import { useSelector } from 'react-redux';
 import { AppRootState } from './index';
 import deepEqual from 'fast-deep-equal';
-import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../utils/storage';
+import {
+  getNotaryApi,
+  getProxyApi,
+  getMaxSent,
+  getMaxRecv,
+} from '../utils/storage';
 import { BackgroundActiontype } from '../entries/Background/rpc';
 import browser from 'webextension-polyfill';
 
@@ -13,6 +18,7 @@ enum ActionType {
   '/requests/setRequests' = '/requests/setRequests',
   '/requests/addRequest' = '/requests/addRequest',
   '/requests/setActiveTab' = '/requests/setActiveTab',
+  '/requests/isConnected' = '/requests/isConnected',
 }
 
 type Action<payload> = {
@@ -27,11 +33,22 @@ 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[]> => ({
@@ -40,14 +57,10 @@ export const setRequests = (requests: RequestLog[]): Action<RequestLog[]> => ({
 });
 
 export const notarizeRequest = (options: RequestHistory) => async () => {
-  const notaryUrl = await get(
-    NOTARY_API_LS_KEY,
-    'https://notary.pse.dev/v0.1.0-alpha.5',
-  );
-  const websocketProxyUrl = await get(
-    PROXY_API_LS_KEY,
-    'wss://notary.pse.dev/proxy',
-  );
+  const notaryUrl = await getNotaryApi();
+  const websocketProxyUrl = await getProxyApi();
+  const maxSentData = await getMaxSent();
+  const maxRecvData = await getMaxRecv();
 
   chrome.runtime.sendMessage<any, string>({
     type: BackgroundActiontype.prove_request_start,
@@ -56,7 +69,8 @@ export const notarizeRequest = (options: RequestHistory) => async () => {
       method: options.method,
       headers: options.headers,
       body: options.body,
-      maxTranscriptSize: options.maxTranscriptSize,
+      maxSentData,
+      maxRecvData,
       secretHeaders: options.secretHeaders,
       secretResps: options.secretResps,
       notaryUrl,
@@ -110,6 +124,11 @@ export default function requests(
           [action.payload.requestId]: action.payload,
         },
       };
+    case ActionType['/requests/isConnected']:
+      return {
+        ...state,
+        isConnected: action.payload,
+      };
     default:
       return state;
   }
@@ -139,3 +158,7 @@ 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 +1,6 @@
-export const EXPLORER_API = 'http://localhost:3000';
+export const EXPLORER_API = 'https://explorer.tlsnotary.org';
+export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.10';
+export const RENDEZVOUS_API = 'wss://explorer.tlsnotary.org';
+export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy';
+export const MAX_RECV = 16384;
+export const MAX_SENT = 4096;

src/utils/misc.ts

@@ -1,5 +1,26 @@
-import { RequestLog } from '../entries/Background/rpc';
+import {
+  BackgroundActiontype,
+  handleExecP2PPluginProver,
+  handleExecPluginProver,
+  RequestLog,
+} from '../entries/Background/rpc';
 import { EXPLORER_API } from './constants';
+import createPlugin, {
+  CallContext,
+  ExtismPluginOptions,
+  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';
+const charwise = require('charwise');
 
 export function urlify(
   text: string,
@@ -44,7 +65,6 @@ export function download(filename: string, content: string) {
 
 export async function upload(filename: string, content: string) {
   const formData = new FormData();
-
   formData.append(
     'file',
     new Blob([content], { type: 'application/json' }),
@@ -69,6 +89,19 @@ 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,
@@ -95,8 +128,14 @@ export async function replayRequest(req: RequestLog): Promise<string> {
 
   // @ts-ignore
   const resp = await fetch(req.url, options);
+  return extractBodyFromResponse(resp);
+}
+
+export const extractBodyFromResponse = async (
+  resp: Response,
+): Promise<string> => {
   const contentType =
-    resp?.headers.get('content-type') || resp?.headers.get('Content-Type');
+    resp.headers.get('content-type') || resp.headers.get('Content-Type');
 
   if (contentType?.includes('application/json')) {
     return resp.text();
@@ -107,4 +146,330 @@ export async function replayRequest(req: RequestLog): Promise<string> {
   } else {
     return resp.blob().then((blob) => blob.text());
   }
+};
+
+export const sha256 = async (data: string) => {
+  const encoder = new TextEncoder().encode(data);
+  const hashBuffer = await crypto.subtle.digest('SHA-256', encoder);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
+  const hashHex = hashArray
+    .map((bytes) => bytes.toString(16).padStart(2, '0'))
+    .join('');
+  return hashHex;
+};
+
+const VALID_HOST_FUNCS: { [name: string]: string } = {
+  redirect: 'redirect',
+  notarize: 'notarize',
+};
+
+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',
+    tabId: tab?.id,
+  };
+
+  const approvedRequests = config?.requests || [];
+  const approvedNotary = [await getNotaryApi()].concat(config?.notaryUrls);
+  const approvedProxy = [await getProxyApi()].concat(config?.proxyUrls);
+
+  const HostFunctions: {
+    [key: string]: (callContext: CallContext, ...args: any[]) => any;
+  } = {
+    redirect: function (context: CallContext, off: bigint) {
+      const r = context.read(off);
+      const url = r.text();
+      browser.tabs.update(tab.id, { url });
+    },
+    notarize: function (context: CallContext, off: bigint) {
+      const r = context.read(off);
+      const params = JSON.parse(r.text());
+      const now = Date.now();
+      const id = charwise.encode(now).toString('hex');
+
+      if (
+        !approvedRequests.find(
+          ({ method, url }) =>
+            method === params.method && minimatch(params.url, url),
+        )
+      ) {
+        throw new Error(`Unapproved request - ${params.method}: ${params.url}`);
+      }
+
+      if (
+        params.notaryUrl &&
+        !approvedNotary.find((n) => n === params.notaryUrl)
+      ) {
+        throw new Error(`Unapproved notary: ${params.notaryUrl}`);
+      }
+
+      if (
+        params.websocketProxyUrl &&
+        !approvedProxy.find((w) => w === params.websocketProxyUrl)
+      ) {
+        throw new Error(`Unapproved proxy: ${params.websocketProxyUrl}`);
+      }
+
+      (async () => {
+        const { getSecretResponse, body: reqBody } = params;
+
+        if (meta?.p2p) {
+          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,
+              clientId: meta.clientId,
+            },
+          });
+        } 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,
+            },
+          });
+        }
+      })();
+
+      return context.store(`${id}`);
+    },
+  };
+  const funcs: {
+    [key: string]: (callContext: CallContext, ...args: any[]) => any;
+  } = {};
+
+  for (const fn of Object.keys(VALID_HOST_FUNCS)) {
+    funcs[fn] = function (context: CallContext) {
+      throw new Error(`no permission for ${fn}`);
+    };
+  }
+
+  if (config?.hostFunctions) {
+    for (const fn of config.hostFunctions) {
+      funcs[fn] = HostFunctions[fn];
+    }
+  }
+
+  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;
+    }
+    // @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;
+    }
+    // @ts-ignore
+    injectedConfig.headers = JSON.stringify(headers);
+  }
+
+  const pluginConfig: ExtismPluginOptions = {
+    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)
+};
+
+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)
+};
+
+export type PluginMetadata = {
+  origin: string;
+  filePath: string;
+} & { [k: string]: string };
+
+export const getPluginConfig = async (
+  data: Plugin | ArrayBuffer,
+): Promise<PluginConfig> => {
+  const plugin = data instanceof ArrayBuffer ? await makePlugin(data) : data;
+  const out = await plugin.call('config');
+  const config: PluginConfig = JSON.parse(out.string());
+
+  assert(typeof config.title === 'string' && config.title.length);
+  assert(typeof config.description === 'string' && config.description.length);
+  assert(!config.icon || typeof config.icon === 'string');
+
+  for (const req of config.requests) {
+    assert(typeof req.method === 'string' && req.method);
+    assert(typeof req.url === 'string' && req.url);
+  }
+
+  if (config.hostFunctions) {
+    for (const func of config.hostFunctions) {
+      assert(typeof func === 'string' && !!VALID_HOST_FUNCS[func]);
+    }
+  }
+
+  if (config.notaryUrls) {
+    for (const notaryUrl of config.notaryUrls) {
+      assert(typeof notaryUrl === 'string' && notaryUrl);
+    }
+  }
+
+  if (config.proxyUrls) {
+    for (const proxyUrl of config.proxyUrls) {
+      assert(typeof proxyUrl === 'string' && proxyUrl);
+    }
+  }
+
+  if (config.cookies) {
+    for (const name of config.cookies) {
+      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);
+    }
+  }
+
+  if (config.steps) {
+    for (const step of config.steps) {
+      assert(typeof step.title === 'string' && step.title.length);
+      assert(!step.description || typeof step.description);
+      assert(typeof step.cta === 'string' && step.cta.length);
+      assert(typeof step.action === 'string' && step.action.length);
+      assert(!step.prover || typeof step.prover === 'boolean');
+    }
+  }
+
+  return config;
+};
+
+export const assert = (expr: any, msg = 'unknown error') => {
+  if (!expr) throw new Error(msg);
+};
+
+export const hexToArrayBuffer = (hex: string) =>
+  new Uint8Array(Buffer.from(hex, 'hex')).buffer;
+
+export const cacheToMap = (cache: NodeCache) => {
+  const keys = cache.keys();
+  return keys.reduce((acc: { [k: string]: string }, key) => {
+    acc[key] = cache.get(key) || '';
+    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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,87 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,56 @@
+import browser from 'webextension-polyfill';
+import { BackgroundActiontype } from '../entries/Background/rpc';
+import { PluginConfig } from './misc';
+
+export async function addPlugin(hex: string, url: string) {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.add_plugin,
+    data: { hex, url },
+  });
+}
+
+export async function removePlugin(hash: string) {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.remove_plugin,
+    data: hash,
+  });
+}
+
+export async function fetchPluginHashes() {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.get_plugin_hashes,
+  });
+}
+
+export async function fetchPluginByHash(hash: string) {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.get_plugin_by_hash,
+    data: hash,
+  });
+}
+
+export async function fetchPluginConfigByHash(
+  hash: string,
+): Promise<PluginConfig | null> {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.get_plugin_config_by_hash,
+    data: hash,
+  });
+}
+
+export async function runPlugin(
+  hash: string,
+  method: string,
+  params?: string,
+  meta?: any,
+) {
+  return browser.runtime.sendMessage({
+    type: BackgroundActiontype.run_plugin,
+    data: {
+      hash,
+      method,
+      params,
+    },
+    meta,
+  });
+}

src/utils/storage.ts

@@ -1,6 +1,13 @@
+import { LoggingLevel } from 'tlsn-js';
+import { MAX_RECV, MAX_SENT, NOTARY_API, NOTARY_PROXY } from './constants';
+import { RENDEZVOUS_API } from './constants';
+
 export const NOTARY_API_LS_KEY = 'notary-api';
 export const PROXY_API_LS_KEY = 'proxy-api';
-export const HISTORY_LS_KEY = 'history';
+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 async function set(key: string, value: string) {
   return chrome.storage.sync.set({ [key]: value });
@@ -10,5 +17,29 @@ export async function get(key: string, defaultValue?: string) {
   return chrome.storage.sync
     .get(key)
     .then((json: any) => json[key] || defaultValue)
-    .catch(() => '');
+    .catch(() => defaultValue);
+}
+
+export async function getMaxSent() {
+  return parseInt(await get(MAX_SENT_LS_KEY, MAX_SENT.toString()));
+}
+
+export async function getMaxRecv() {
+  return parseInt(await get(MAX_RECEIVED_LS_KEY, MAX_RECV.toString()));
+}
+
+export async function getNotaryApi() {
+  return await get(NOTARY_API_LS_KEY, NOTARY_API);
+}
+
+export async function getProxyApi() {
+  return await get(PROXY_API_LS_KEY, NOTARY_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);
 }

src/utils/types.ts

@@ -0,0 +1,10 @@
+import { PresentationJSON as PresentationJSONa7 } from 'tlsn-js/build/types';
+
+export type PresentationJSON = PresentationJSONa5 | PresentationJSONa7;
+
+export type PresentationJSONa5 = {
+  version?: undefined;
+  session: any;
+  substrings: any;
+  notaryUrl: string;
+};

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": false,
     "skipLibCheck": true,

utils/bookmark/bookmarks.json

@@ -1,22 +0,0 @@
-[
-  {
-    "url": "https://api.twitter.com/1.1/account/settings.json",
-    "targetUrl": "https://www.twitter.com",
-    "method": "GET",
-    "type": "xmlhttprequest",
-    "title": "Twitter Profile",
-    "description": "Notarize ownership of a twitter profile. To start, go to your own profile",
-    "responseSelector": "(?<=\"screen_name\":)\"(.*?)\"",
-    "valueTransform": "\"screen_name\":%s"
-  },
-  {
-    "url": "https://gateway.reddit.com/desktopapi/v1/prefs",
-    "targetUrl": "https://www.reddit.com/settings",
-    "method": "GET",
-    "type": "xmlhttprequest",
-    "title": "Reddit Profile",
-    "description": "Notarize ownership of a reddit profile. To start, go to reddit.com/settings",
-    "responseSelector": "(?<=\"displayText\": )\"(.*?)\"",
-    "valueTransform": "\"displayText\": %s"
-  }
-]

utils/bookmark/index.ts

@@ -1,34 +0,0 @@
-import bookmarks from './bookmarks.json';
-import { RequestLog } from '../../src/entries/Background/rpc';
-
-type Bookmark = {
-  url: string;
-  title: string;
-  description: string;
-  method: string;
-  type: string;
-};
-
-export function findBookmarksByURL(url: URL | null): Bookmark[] {
-  if (!url) return [];
-
-  return bookmarks.filter((m) => {
-    const _url = new URL(m.url);
-    return url.host === _url.host;
-  });
-}
-
-export function filterByBookmarks(requests: RequestLog[]): Bookmark[] {
-  const hosts = requests
-    .map((r) => r.url && new URL(r.url).host)
-    .reduce((acc: { [host: string]: string }, host) => {
-      acc[host] = host;
-      return acc;
-    }, {});
-
-  return bookmarks.filter((bm) => {
-    if (hosts[new URL(bm.url).host]) {
-      return true;
-    }
-  });
-}

webpack.config.js

@@ -7,7 +7,6 @@ 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 || "/";
@@ -40,7 +39,11 @@ var options = {
   mode: process.env.NODE_ENV || "development",
   ignoreWarnings: [
     /Circular dependency between chunks with runtime/,
-    /ResizeObserver loop completed with undelivered notifications/
+    /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/,
   ],
 
   entry: {
@@ -48,7 +51,9 @@ 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"),
   },
   // chromeExtensionBoilerplate: {
   //   notHotReload: ["background", "contentScript", "devtools"],
@@ -80,6 +85,9 @@ var options = {
             loader: "sass-loader",
             options: {
               sourceMap: true,
+              sassOptions: {
+                silenceDeprecations: ["legacy-js-api"],
+              }
             },
           },
         ],
@@ -105,11 +113,6 @@ var options = {
           {
             loader: require.resolve("ts-loader"),
             options: {
-              getCustomTransformers: () => ({
-                before: [isDevelopment && ReactRefreshTypeScript()].filter(
-                  Boolean
-                ),
-              }),
               transpileOnly: isDevelopment,
             },
           },
@@ -146,9 +149,9 @@ var options = {
     new webpack.ProgressPlugin(),
     // expose and write the allowed env vars on the compiled bundle
     new webpack.EnvironmentPlugin(["NODE_ENV"]),
-    new ExtReloader({
-      manifest: path.resolve(__dirname, "src/manifest.json")
-    }),
+    // new ExtReloader({
+    //   manifest: path.resolve(__dirname, "src/manifest.json")
+    // }),
     new CopyWebpackPlugin({
       patterns: [
         {
@@ -197,31 +200,21 @@ 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({
@@ -242,6 +235,12 @@ var options = {
       chunks: ["offscreen"],
       cache: false,
     }),
+    new HtmlWebpackPlugin({
+      template: path.join(__dirname, "src", "entries", "SidePanel", "index.html"),
+      filename: "sidePanel.html",
+      chunks: ["sidePanel"],
+      cache: false,
+    }),
     new webpack.ProvidePlugin({
       Buffer: ['buffer', 'Buffer'],
     }),

websockify_config

@@ -1,6 +0,0 @@
-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