chatbox fix

.eslintrc

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

.gitignore

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

README.md

@@ -1,27 +1,9 @@
-![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
 
-> [!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.
-
+### ⚠️ 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
 
 ## Installing and Running
 
@@ -42,7 +24,7 @@ at your option.
 ```
 $ git clone https://github.com/novnc/websockify && cd websockify
 $ ./docker/build.sh
-$ docker run -it --rm -p 55688:80 novnc/websockify 80 api.x.com:443
+$ docker run -it --rm -p 55688:80 novnc/websockify 80 api.twitter.com:443
 ```
 
 ## Running Websockify Docker Image

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsn-extension",
-  "version": "0.1.0.6",
+  "version": "0.1.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -16,7 +16,6 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@extism/extism": "^1.0.2",
     "@fortawesome/fontawesome-free": "^6.4.2",
     "async-mutex": "^0.4.0",
     "buffer": "^6.0.3",
@@ -27,7 +26,6 @@
     "fast-deep-equal": "^3.1.3",
     "fuse.js": "^6.6.2",
     "level": "^8.0.0",
-    "minimatch": "^9.0.4",
     "node-cache": "^5.1.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -38,8 +36,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2",
     "tailwindcss": "^3.3.3",
-    "tlsn-js": "0.1.0-alpha.6.2",
-    "tlsn-js-v5": "npm:tlsn-js@0.1.0-alpha.5.4"
+    "tlsn-js": "0.1.0-alpha.4.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.12",

src/components/ChatBox/index.tsx

@@ -0,0 +1,114 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import {
+  sendChat,
+  useChatMessages,
+  useClientId,
+  usePairId,
+} from '../../reducers/p2p';
+import { useDispatch } from 'react-redux';
+import classNames from 'classnames';
+import Icon from '../Icon';
+
+export default function ChatBox() {
+  const messages = useChatMessages();
+  const dispatch = useDispatch();
+  const clientId = useClientId();
+  const [text, setText] = useState('');
+  const pairId = usePairId();
+
+  const onSend = useCallback(() => {
+    if (text && pairId) {
+      dispatch(
+        sendChat({
+          text,
+          from: clientId,
+          to: pairId,
+        }),
+      );
+
+      setText('');
+
+      console.log('after sending');
+    }
+  }, [text, pairId]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (e.key === 'Enter' && text && pairId)  {
+        onSend();
+        setText('');
+      }
+    },
+    [text],
+  );
+  const isClient = (msg: any) => {
+    return msg.from === clientId;
+  };
+
+  return (
+    <div className="flex flex-col flex-nowrap flex-grow gap-1 p-2 flex-shrink h-0 ">
+      <div className="flex flex-row gap-1 font-semibold text-xs align-center">
+        <div>Client ID:</div>
+        {clientId ? (
+          <div className="text-green-500">{clientId}</div>
+        ) : (
+          <Icon
+            className="animate-spin text-gray-500"
+            fa="fa-solid fa-spinner"
+            size={1}
+          />
+        )}
+      </div>
+      <div className="flex flex-row gap-1 font-semibold text-xs align-center">
+        <div>Peer ID:</div>
+        {pairId ? (
+          <div className="text-red-500">{pairId}</div>
+        ) : (
+          <div className="flex flex-row gap-1">
+            <span className="text-slate-500">Waiting for Peer</span>
+            <Icon
+              className="animate-spin text-slate-500 w-fit"
+              fa="fa-solid fa-spinner"
+              size={1}
+            />
+          </div>
+        )}
+      </div>
+      <div className="flex flex-col flex-grow flex-shrink h-0 gap-1">
+        <div className="flex flex-col border gap-1 border-slate-200 flex-grow overflow-y-auto">
+          {messages.map((msg) => {
+            return (
+              <div
+                className={`rounded-lg p-2 max-w-[50%] break-all ${isClient(msg) ? 'mr-auto  bg-blue-600' : 'ml-auto bg-slate-300'}`}
+              >
+                <div
+                  className={`${isClient(msg) ? 'text-white' : 'text-black'}`}
+                >
+                  {msg.text}
+                </div>
+              </div>
+            );
+          })}
+        </div>
+        <div className="flex flex-row w-full gap-1">
+          <input
+            className="input border border-slate-200 focus:border-slate-400 flex-grow p-2"
+            onChange={(e) => setText(e.target.value)}
+            onKeyDown={handleKeyDown}
+            value={text}
+            autoFocus
+          />
+          <button
+            className={classNames('button', {
+              'button--primary': !!text && !!pairId,
+            })}
+            disabled={!text || !pairId}
+            onClick={onSend}
+          >
+            Send
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}

src/components/ConnectionDetailsModal/index.tsx

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

src/components/ErrorModal/index.tsx

@@ -1,26 +0,0 @@
-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/Modal/Modal.tsx

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

src/components/PluginInfo/index.scss

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

src/components/PluginInfo/index.tsx

@@ -1,208 +0,0 @@
-import React, {
-  ChangeEvent,
-  Children,
-  MouseEventHandler,
-  ReactElement,
-  ReactNode,
-  useCallback,
-  useState,
-} from 'react';
-import { makePlugin, getPluginConfig } from '../../utils/misc';
-import { addPlugin } from '../../utils/rpc';
-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 { ErrorModal } from '../ErrorModal';
-import classNames from 'classnames';
-import DefaultPluginIcon from '../../assets/img/default-plugin-icon.png';
-
-export default function PluginUploadInfo(): ReactElement {
-  const [error, showError] = useState('');
-  const [pluginBuffer, setPluginBuffer] = useState<ArrayBuffer | any>(null);
-  const [pluginContent, setPluginContent] = useState<PluginConfig | null>(null);
-
-  const onAddPlugin = useCallback(
-    async (evt: React.MouseEvent<HTMLButtonElement>) => {
-      try {
-        await addPlugin(Buffer.from(pluginBuffer).toString('hex'));
-        setPluginContent(null);
-      } catch (e: any) {
-        showError(e?.message || 'Invalid Plugin');
-      }
-    },
-    [pluginContent, pluginBuffer],
-  );
-
-  const onPluginInfo = useCallback(
-    async (evt: ChangeEvent<HTMLInputElement>) => {
-      if (!evt.target.files) return;
-      try {
-        const [file] = evt.target.files;
-        const arrayBuffer = await file.arrayBuffer();
-        const plugin = await makePlugin(arrayBuffer);
-        setPluginContent(await getPluginConfig(plugin));
-        setPluginBuffer(arrayBuffer);
-      } catch (e: any) {
-        showError(e?.message || 'Invalid Plugin');
-      } finally {
-        evt.target.value = '';
-      }
-    },
-    [setPluginContent, setPluginBuffer],
-  );
-
-  const onClose = useCallback(() => {
-    setPluginContent(null);
-    setPluginBuffer(null);
-  }, []);
-
-  return (
-    <>
-      <input
-        className="opacity-0 absolute top-0 right-0 h-full w-full cursor-pointer"
-        type="file"
-        onChange={onPluginInfo}
-      />
-      {error && <ErrorModal onClose={() => showError('')} message={error} />}
-      {pluginContent && (
-        <PluginInfoModal
-          pluginContent={pluginContent}
-          onClose={onClose}
-          onAddPlugin={onAddPlugin}
-        />
-      )}
-    </>
-  );
-}
-
-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.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

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

@@ -1,255 +0,0 @@
-import React, {
-  MouseEventHandler,
-  ReactElement,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
-import {
-  fetchPluginHashes,
-  removePlugin,
-  fetchPluginConfigByHash,
-  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 { getPluginConfigByHash } from '../../entries/Background/db';
-import { OffscreenActionTypes } from '../../entries/Offscreen/types';
-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 getPluginConfigByHash(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

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

src/components/RequestDetail/index.tsx

@@ -17,15 +17,7 @@ import {
 } from 'react-router';
 import Icon from '../Icon';
 import NavigateWithParams from '../NavigateWithParams';
-import {
-  set,
-  get,
-  MAX_SENT_LS_KEY,
-  MAX_RECEIVED_LS_KEY,
-  getMaxRecv,
-  getMaxSent,
-} from '../../utils/storage';
-import { MAX_RECV, MAX_SENT } from '../../utils/constants';
+import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../../utils/storage';
 import { urlify } from '../../utils/misc';
 
 type Props = {
@@ -39,6 +31,7 @@ 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]);
 
@@ -61,9 +54,6 @@ 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}
@@ -84,7 +74,6 @@ 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>
     </>
@@ -112,62 +101,6 @@ 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/ResponseDetail/index.tsx

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

src/entries/Background/cache.ts

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

src/entries/Background/db.ts

@@ -1,39 +1,13 @@
 import { Level } from 'level';
 import type { RequestHistory } from './rpc';
-import { PluginConfig, PluginMetadata, sha256 } from '../../utils/misc';
-import mutex from './mutex';
 const charwise = require('charwise');
 
-export const db = new Level('./ext-db', {
+const db = new Level('./ext-db', {
   valueEncoding: 'json',
 });
 const historyDb = db.sublevel<string, RequestHistory>('history', {
   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 appDb = db.sublevel<string, any>('app', {
-  valueEncoding: 'json',
-});
-enum AppDatabaseKey {
-  DefaultPluginsInstalled = 'DefaultPluginsInstalled',
-}
 
 export async function addNotaryRequest(
   now = Date.now(),
@@ -146,251 +120,5 @@ export async function getNotaryRequests(): Promise<RequestHistory[]> {
 export async function getNotaryRequest(
   id: string,
 ): Promise<RequestHistory | null> {
-  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 getPluginByHash(hash: string): Promise<string | null> {
-  try {
-    const plugin = await pluginDb.get(hash);
-    return plugin;
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function addPlugin(hex: string): Promise<string | null> {
-  const hash = await sha256(hex);
-
-  if (await getPluginByHash(hash)) {
-    return null;
-  }
-
-  await pluginDb.put(hash, hex);
-  return hash;
-}
-
-export async function removePlugin(hash: string): Promise<string | null> {
-  const existing = await pluginDb.get(hash);
-
-  if (!existing) return null;
-
-  await pluginDb.del(hash);
-
-  return hash;
-}
-
-export async function getPluginConfigByHash(
-  hash: string,
-): Promise<PluginConfig | null> {
-  try {
-    const config = await pluginConfigDb.get(hash);
-    return config;
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function addPluginConfig(
-  hash: string,
-  config: PluginConfig,
-): Promise<PluginConfig | null> {
-  if (await getPluginConfigByHash(hash)) {
-    return null;
-  }
-
-  await pluginConfigDb.put(hash, config);
-  return config;
-}
-
-export async function removePluginConfig(
-  hash: string,
-): Promise<PluginConfig | null> {
-  const existing = await pluginConfigDb.get(hash);
-
-  if (!existing) return null;
-
-  await pluginConfigDb.del(hash);
-
-  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 getPluginConfigByHash(hash);
-    const metadata = await getPluginMetadataByHash(hash);
-    if (config) {
-      ret.push({
-        ...config,
-        hash,
-        metadata: metadata || {
-          filePath: '',
-          origin: '',
-        },
-      });
-    }
-  }
-  return ret;
-}
-
-export async function getPluginMetadataByHash(
-  hash: string,
-): Promise<PluginMetadata | null> {
-  try {
-    const metadata = await pluginMetadataDb.get(hash);
-    return metadata;
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function addPluginMetadata(
-  hash: string,
-  metadata: PluginMetadata,
-): Promise<PluginMetadata | null> {
-  await pluginMetadataDb.put(hash, metadata);
-  return metadata;
-}
-
-export async function removePluginMetadata(
-  hash: string,
-): Promise<PluginMetadata | null> {
-  const existing = await pluginMetadataDb.get(hash);
-
-  if (!existing) return null;
-
-  await pluginMetadataDb.del(hash);
-
-  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(host: string, name: string) {
-  try {
-    const existing = await cookiesDb.sublevel(host).get(name);
-    return existing;
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function getCookiesByHost(host: string) {
-  const ret: { [key: string]: string } = {};
-  for await (const [key, value] of cookiesDb.sublevel(host).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(host: string, name: string, value?: string) {
-  if (!value) return null;
-  return mutex.runExclusive(async () => {
-    await headersDb.sublevel(host).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(host: string) {
-  const ret: { [key: string]: string } = {};
-  for await (const [key, value] of headersDb.sublevel(host).iterator()) {
-    ret[key] = value;
-  }
-  return ret;
-}
-
-async function getDefaultPluginsInstalled(): Promise<boolean> {
-  return appDb.get(AppDatabaseKey.DefaultPluginsInstalled).catch(() => false);
-}
-
-export async function setDefaultPluginsInstalled(installed = false) {
-  return mutex.runExclusive(async () => {
-    await appDb.put(AppDatabaseKey.DefaultPluginsInstalled, installed);
-  });
-}
-
-export async function getAppState() {
-  return {
-    defaultPluginsInstalled: await getDefaultPluginsInstalled(),
-  };
+  return historyDb.get(id);
 }

src/entries/Background/handlers.ts

@@ -3,8 +3,6 @@ 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 { setCookies, setHeaders } from './db';
 
 export const onSendHeaders = (
   details: browser.WebRequest.OnSendHeadersDetailsType,
@@ -15,24 +13,6 @@ export const onSendHeaders = (
     if (method !== 'OPTIONS') {
       const cache = getCacheByTabId(tabId);
       const existing = cache.get<RequestLog>(requestId);
-      const { hostname } = urlify(details.url) || {};
-
-      if (hostname && details.requestHeaders) {
-        details.requestHeaders.forEach((header) => {
-          const { name, value } = header;
-          if (/^cookie$/i.test(name) && value) {
-            value
-              .split(';')
-              .map((v) => v.split('='))
-              .forEach((cookie) => {
-                setCookies(hostname, cookie[0].trim(), cookie[1]);
-              });
-          } else {
-            setHeaders(hostname, name, value);
-          }
-        });
-      }
-
       cache.set(requestId, {
         ...existing,
         method: details.method as 'GET' | 'POST',

src/entries/Background/index.ts

@@ -1,8 +1,6 @@
 import { onBeforeRequest, onResponseStarted, onSendHeaders } from './handlers';
 import { deleteCacheByTabId } from './cache';
 import browser from 'webextension-polyfill';
-import { getAppState, setDefaultPluginsInstalled } from './db';
-import { installPlugin } from './plugins/utils';
 
 (async () => {
   browser.webRequest.onSendHeaders.addListener(
@@ -33,19 +31,6 @@ import { installPlugin } from './plugins/utils';
     deleteCacheByTabId(tabId);
   });
 
-  const { defaultPluginsInstalled } = await getAppState();
-
-  if (!defaultPluginsInstalled) {
-    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(true);
-    }
-  }
-
   const { initRPC } = await import('./rpc');
   await createOffscreenDocument();
   initRPC();

src/entries/Background/plugins/utils.ts

@@ -1,29 +0,0 @@
-import { addPlugin, addPluginConfig, addPluginMetadata } from '../db';
-import { getPluginConfig } from '../../../utils/misc';
-
-export async function installPlugin(
-  urlOrBuffer: ArrayBuffer | string,
-  origin = '',
-  filePath = '',
-  metadata: {[key: string]: string} = {},
-) {
-  let arrayBuffer;
-
-  if (typeof urlOrBuffer === 'string') {
-    const resp = await fetch(urlOrBuffer);
-    arrayBuffer = await resp.arrayBuffer();
-  } else {
-    arrayBuffer = urlOrBuffer;
-  }
-
-  const config = await getPluginConfig(arrayBuffer);
-  const hex = Buffer.from(arrayBuffer).toString('hex');
-  const hash = await addPlugin(hex);
-  await addPluginConfig(hash!, config);
-  await addPluginMetadata(hash!, {
-    ...metadata,
-    origin,
-    filePath,
-  });
-  return hash;
-}

src/entries/Background/ws.ts

@@ -1,584 +0,0 @@
-import { devlog, safeParseJSON, sha256 } from '../../utils/misc';
-import {
-  appendIncomingPairingRequests,
-  appendIncomingProofRequests,
-  appendOutgoingPairingRequests,
-  appendOutgoingProofRequest,
-  setClientId,
-  setConnected,
-  setIncomingPairingRequest,
-  setIncomingProofRequest,
-  setOutgoingPairingRequest,
-  setOutgoingProofRequest,
-  setP2PError,
-  setPairing,
-} from '../../reducers/p2p';
-import { pushToRedux } from '../utils';
-import { getPluginByHash } from './db';
-import browser from 'webextension-polyfill';
-import { OffscreenActionTypes } from '../Offscreen/types';
-import { getMaxRecv, getMaxSent, getRendezvousApi } from '../../utils/storage';
-import { SidePanelActionTypes } from '../SidePanel/types';
-
-const state: {
-  clientId: string;
-  pairing: string;
-  socket: WebSocket | null;
-  connected: boolean;
-  reqId: number;
-  incomingPairingRequests: string[];
-  outgoingPairingRequests: string[];
-  incomingProofRequests: string[];
-  outgoingProofRequests: string[];
-} = {
-  clientId: '',
-  pairing: '',
-  socket: null,
-  connected: false,
-  reqId: 0,
-  incomingPairingRequests: [],
-  outgoingPairingRequests: [],
-  incomingProofRequests: [],
-  outgoingProofRequests: [],
-};
-
-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));
-};
-
-export const connectSession = async () => {
-  if (state.socket) return;
-
-  const socket = new WebSocket('ws://localhost:3001');
-
-  socket.onopen = () => {
-    devlog('Connected to websocket');
-    state.connected = true;
-    state.socket = socket;
-    pushToRedux(setConnected(true));
-  };
-
-  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));
-        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));
-        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));
-        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));
-        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 } = message.params;
-        state.incomingProofRequests = [
-          ...new Set(state.incomingProofRequests.concat(plugin)),
-        ];
-        pushToRedux(appendIncomingProofRequests(plugin));
-        handleProofRequestReceived(pluginHash);
-        break;
-      }
-      case 'request_proof_by_hash': {
-        const { pluginHash } = message.params;
-        const plugin = await getPluginByHash(pluginHash);
-        if (plugin) {
-          state.incomingProofRequests = [
-            ...new Set(state.incomingProofRequests.concat(plugin)),
-          ];
-          pushToRedux(appendIncomingProofRequests(plugin));
-          handleProofRequestReceived(pluginHash);
-        } else {
-          handleNoPluginHash(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':
-      case 'proof_request_reject':
-        await handleRemoveOutgoingProofRequest(message);
-        break;
-      case 'proof_request_cancel':
-      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,
-          },
-        });
-        break;
-      }
-      case 'verifier_started': {
-        const { pluginHash } = message.params;
-        browser.runtime.sendMessage({
-          type: SidePanelActionTypes.start_p2p_plugin,
-          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;
-        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 getPluginByHash(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;
-  await state.socket.close();
-  state.socket = null;
-  state.clientId = '';
-  state.pairing = '';
-  state.connected = false;
-  state.incomingPairingRequests = [];
-  state.outgoingPairingRequests = [];
-  state.incomingProofRequests = [];
-  state.outgoingProofRequests = [];
-  pushToRedux(setPairing(''));
-  pushToRedux(setConnected(false));
-  pushToRedux(setClientId(''));
-  pushToRedux(setIncomingPairingRequest([]));
-  pushToRedux(setOutgoingPairingRequest([]));
-  pushToRedux(setIncomingProofRequest([]));
-  pushToRedux(setOutgoingProofRequest([]));
-};
-
-export const sendPairRequest = async (target: string) => {
-  const { socket, clientId } = state;
-
-  if (clientId === target) return;
-
-  if (socket && clientId) {
-    socket.send(
-      bufferify({
-        method: 'pair_request',
-        params: {
-          from: clientId,
-          to: target,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const cancelPairRequest = async (target: string) => {
-  const { socket, clientId } = state;
-
-  if (clientId === target) return;
-
-  if (socket && clientId) {
-    socket.send(
-      bufferify({
-        method: 'pair_request_cancel',
-        params: {
-          from: clientId,
-          to: target,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const acceptPairRequest = async (target: string) => {
-  const { socket, clientId } = state;
-
-  if (clientId === target) return;
-
-  if (socket && clientId) {
-    socket.send(
-      bufferify({
-        method: 'pair_request_accept',
-        params: {
-          from: clientId,
-          to: target,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const rejectPairRequest = async (target: string) => {
-  const { socket, clientId } = state;
-
-  if (clientId === target) return;
-
-  if (socket && clientId) {
-    socket.send(
-      bufferify({
-        method: 'pair_request_reject',
-        params: {
-          from: clientId,
-          to: target,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const requestProof = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  const pluginHex = await getPluginByHash(pluginHash);
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'request_proof',
-        params: {
-          from: clientId,
-          to: pairing,
-          plugin: pluginHex,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const requestProofByHash = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'request_proof_by_hash',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const cancelProofRequest = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'proof_request_cancel',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const acceptProofRequest = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'proof_request_accept',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const startProofRequest = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'proof_request_start',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const endProofRequest = async (data: {
-  pluginHash: string;
-  proof: any;
-}) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'proof_request_end',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash: data.pluginHash,
-          proof: data.proof,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const rejectProofRequest = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'proof_request_reject',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const startedVerifier = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'verifier_started',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const startedProver = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'prover_started',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const handleNoPluginHash = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'request_proof_by_hash_failed',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-export const handleProofRequestReceived = async (pluginHash: string) => {
-  const { socket, clientId, pairing } = state;
-  if (socket && clientId && pairing) {
-    socket.send(
-      bufferify({
-        method: 'proof_request_received',
-        params: {
-          from: clientId,
-          to: pairing,
-          pluginHash,
-          id: state.reqId++,
-        },
-      }),
-    );
-  }
-};
-
-function bufferify(data: any): Buffer {
-  return Buffer.from(JSON.stringify(data));
-}

src/entries/Content/content.ts

@@ -1,120 +0,0 @@
-import { ContentScriptTypes, RPCClient } from './rpc';
-import { RequestHistory } from '../Background/rpc';
-import { PluginConfig, PluginMetadata } from '../../utils/misc';
-import { Proof } from '../../utils/types';
-
-const client = new RPCClient();
-
-class TLSN {
-  async getHistory(
-    method: string,
-    url: string,
-    metadata?: {
-      [key: string]: string;
-    },
-  ): Promise<
-    (Pick<
-      RequestHistory,
-      'id' | 'method' | 'notaryUrl' | 'url' | 'websocketProxyUrl'
-    > & { time: Date })[]
-  > {
-    const resp = await client.call(ContentScriptTypes.get_history, {
-      method,
-      url,
-      metadata,
-    });
-
-    return resp || [];
-  }
-
-  async getProof(id: string): Promise<Proof | null> {
-    const resp = await client.call(ContentScriptTypes.get_proof, {
-      id,
-    });
-
-    return resp || null;
-  }
-
-  async notarize(
-    url: string,
-    requestOptions?: {
-      method?: string;
-      headers?: { [key: string]: string };
-      body?: string;
-    },
-    proofOptions?: {
-      notaryUrl?: string;
-      websocketProxyUrl?: string;
-      maxSentData?: number;
-      maxRecvData?: number;
-      maxTranscriptSize?: number;
-      metadata?: {
-        [k: string]: string;
-      };
-    },
-  ): Promise<Proof> {
-    const resp = await client.call(ContentScriptTypes.notarize, {
-      url,
-      method: requestOptions?.method,
-      headers: requestOptions?.headers,
-      body: requestOptions?.body,
-      maxSentData: proofOptions?.maxSentData,
-      maxRecvData: proofOptions?.maxRecvData,
-      maxTranscriptSize: proofOptions?.maxTranscriptSize,
-      notaryUrl: proofOptions?.notaryUrl,
-      websocketProxyUrl: proofOptions?.websocketProxyUrl,
-      metadata: proofOptions?.metadata,
-    });
-
-    return resp;
-  }
-
-  async installPlugin(
-    url: string,
-    metadata?: { [k: string]: string },
-  ): Promise<string> {
-    const resp = await client.call(ContentScriptTypes.install_plugin, {
-      url,
-      metadata,
-    });
-
-    return resp;
-  }
-
-  async getPlugins(
-    url: string,
-    origin?: string,
-    metadata?: {
-      [key: string]: string;
-    },
-  ): Promise<(PluginConfig & { hash: string; metadata: PluginMetadata })[]> {
-    const resp = await client.call(ContentScriptTypes.get_plugins, {
-      url,
-      origin,
-      metadata,
-    });
-
-    return resp;
-  }
-
-  async runPlugin(hash: string) {
-    const resp = await client.call(ContentScriptTypes.run_plugin, {
-      hash,
-    });
-
-    return resp;
-  }
-}
-
-const connect = async () => {
-  const resp = await client.call(ContentScriptTypes.connect);
-
-  if (resp) {
-    return new TLSN();
-  }
-};
-
-// @ts-ignore
-window.tlsn = {
-  connect,
-};

src/entries/Content/index.ts

@@ -1,218 +1,9 @@
-import browser from 'webextension-polyfill';
-import { ContentScriptRequest, ContentScriptTypes, RPCServer } from './rpc';
-import { BackgroundActiontype, RequestHistory } from '../Background/rpc';
-import { urlify } from '../../utils/misc';
+window.onerror = (error) => {
+  // console.log('error');
+  // console.log(error);
+};
 
 (async () => {
-  loadScript('content.bundle.js');
-  const server = new RPCServer();
-
-  server.on(ContentScriptTypes.connect, async () => {
-    const connected = await browser.runtime.sendMessage({
-      type: BackgroundActiontype.connect_request,
-      data: {
-        ...getPopupData(),
-      },
-    });
-
-    if (!connected) throw new Error('user rejected.');
-
-    return connected;
-  });
-
-  server.on(
-    ContentScriptTypes.get_history,
-    async (
-      request: ContentScriptRequest<{
-        method: string;
-        url: string;
-        metadata?: { [k: string]: string };
-      }>,
-    ) => {
-      const {
-        method: filterMethod,
-        url: filterUrl,
-        metadata,
-      } = request.params || {};
-
-      if (!filterMethod || !filterUrl)
-        throw new Error('params must include method and url.');
-
-      const response: RequestHistory[] = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.get_history_request,
-        data: {
-          ...getPopupData(),
-          method: filterMethod,
-          url: filterUrl,
-          metadata,
-        },
-      });
-
-      return response;
-    },
-  );
-
-  server.on(
-    ContentScriptTypes.get_proof,
-    async (request: ContentScriptRequest<{ id: string }>) => {
-      const { id } = request.params || {};
-
-      if (!id) throw new Error('params must include id.');
-
-      const proof = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.get_proof_request,
-        data: {
-          ...getPopupData(),
-          id,
-        },
-      });
-
-      return proof;
-    },
-  );
-
-  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;
-        maxTranscriptSize?: number;
-      }>,
-    ) => {
-      const {
-        url,
-        method,
-        headers,
-        body,
-        maxSentData,
-        maxRecvData,
-        maxTranscriptSize,
-        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,
-          maxTranscriptSize,
-          notaryUrl,
-          websocketProxyUrl,
-          metadata,
-        },
-      });
-
-      return proof;
-    },
-  );
-
-  server.on(
-    ContentScriptTypes.install_plugin,
-    async (
-      request: ContentScriptRequest<{
-        url: string;
-        metadata?: { [k: string]: string };
-      }>,
-    ) => {
-      const { url, metadata } = request.params || {};
-
-      if (!url) throw new Error('params must include url.');
-
-      const response: RequestHistory[] = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.install_plugin_request,
-        data: {
-          ...getPopupData(),
-          url,
-          metadata,
-        },
-      });
-
-      return response;
-    },
-  );
-
-  server.on(
-    ContentScriptTypes.get_plugins,
-    async (
-      request: ContentScriptRequest<{
-        url: string;
-        origin?: string;
-        metadata?: { [k: string]: string };
-      }>,
-    ) => {
-      const {
-        url: filterUrl,
-        origin: filterOrigin,
-        metadata,
-      } = request.params || {};
-
-      if (!filterUrl) throw new Error('params must include url.');
-
-      const response = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.get_plugins_request,
-        data: {
-          ...getPopupData(),
-          url: filterUrl,
-          origin: filterOrigin,
-          metadata,
-        },
-      });
-
-      return response;
-    },
-  );
-
-  server.on(
-    ContentScriptTypes.run_plugin,
-    async (request: ContentScriptRequest<{ hash: string }>) => {
-      const { hash } = request.params || {};
-
-      if (!hash) throw new Error('params must include hash');
-
-      const response = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.run_plugin_request,
-        data: {
-          ...getPopupData(),
-          hash,
-        },
-      });
-
-      return response;
-    },
-  );
+  console.log('Content script works!');
+  console.log('Must reload extension for modifications to take effect.');
 })();
-
-function loadScript(filename: string) {
-  const url = browser.runtime.getURL(filename);
-  const script = document.createElement('script');
-  script.setAttribute('type', 'text/javascript');
-  script.setAttribute('src', url);
-  document.body.appendChild(script);
-}
-
-function getPopupData() {
-  return {
-    origin: window.origin,
-    position: {
-      left: window.screen.width / 2 - 240,
-      top: window.screen.height / 2 - 300,
-    },
-  };
-}

src/entries/Content/rpc.ts

@@ -1,118 +0,0 @@
-import { deferredPromise, PromiseResolvers } from '../../utils/promise';
-
-export enum ContentScriptTypes {
-  connect = 'tlsn/cs/connect',
-  get_history = 'tlsn/cs/get_history',
-  get_proof = 'tlsn/cs/get_proof',
-  notarize = 'tlsn/cs/notarize',
-  install_plugin = 'tlsn/cs/install_plugin',
-  get_plugins = 'tlsn/cs/get_plugins',
-  run_plugin = 'tlsn/cs/run_plugin',
-}
-
-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,123 +1,77 @@
-import React, { useEffect, useState } from 'react';
-import * as Comlink from 'comlink';
-import { OffscreenActionTypes } from './types';
-import {
-  NotaryServer,
-  Prover as _Prover,
-  Verifier as _Verifier,
-  NotarizedSession as _NotarizedSession,
-  TlsProof as _TlsProof,
-} from 'tlsn-js';
-import { verify } from 'tlsn-js-v5';
-
-import { urlify } from '../../utils/misc';
+import React, { useEffect } from 'react';
 import { BackgroundActiontype } from '../Background/rpc';
+import { prove, verify } from 'tlsn-js';
+import { urlify } from '../../utils/misc';
 import browser from 'webextension-polyfill';
-import { Proof, ProofV1 } from '../../utils/types';
-import { Method } from 'tlsn-js/wasm/pkg';
-import { waitForEvent } from '../utils';
-import type { ParsedTranscriptData } from '../../../../tlsn-js/src/types';
-
-const { init, Prover, NotarizedSession, TlsProof, Verifier }: any =
-  Comlink.wrap(new Worker(new URL('./worker.ts', import.meta.url)));
 
 const Offscreen = () => {
   useEffect(() => {
-    (async () => {
-      const loggingLevel = await browser.runtime.sendMessage({
-        type: BackgroundActiontype.get_logging_level,
-        hardwareConcurrency: 1,
-      });
-      await init({ loggingLevel });
-      // @ts-ignore
-      chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
-        switch (request.type) {
-          case OffscreenActionTypes.notarization_request: {
-            const { id } = request.data;
+    // @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 proof = await createProof(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,
-                  },
-                });
+              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,
+                },
+              });
+            }
+          })();
 
-                browser.runtime.sendMessage({
-                  type: OffscreenActionTypes.notarization_response,
-                  data: {
-                    id,
-                    proof,
-                  },
-                });
-              } catch (error) {
-                console.error(error);
-                browser.runtime.sendMessage({
-                  type: BackgroundActiontype.finish_prove_request,
-                  data: {
-                    id,
-                    error,
-                  },
-                });
+          break;
+        }
+        case BackgroundActiontype.verify_proof: {
+          (async () => {
+            const result = await verify(request.data);
+            sendResponse(result);
+          })();
 
-                browser.runtime.sendMessage({
-                  type: OffscreenActionTypes.notarization_response,
-                  data: {
-                    id,
-                    error,
-                  },
-                });
-              }
-            })();
-
-            break;
-          }
-          case BackgroundActiontype.process_prove_request: {
-            const { id } = request.data;
-
-            (async () => {
-              try {
-                const proof = await createProof(request.data);
-
-                browser.runtime.sendMessage({
-                  type: BackgroundActiontype.finish_prove_request,
-                  data: {
-                    id,
-                    proof: proof,
-                  },
-                });
-              } catch (error) {
-                console.error(error);
-                browser.runtime.sendMessage({
-                  type: BackgroundActiontype.finish_prove_request,
-                  data: {
-                    id,
-                    error,
-                  },
-                });
-              }
-            })();
-
-            break;
-          }
-          case BackgroundActiontype.verify_proof: {
-            (async () => {
-              const result = await verifyProof(request.data);
-              sendResponse(result);
-            })();
-
-            return true;
-          }
-          case BackgroundActiontype.verify_prove_request: {
-            (async () => {
-              const proof: Proof = request.data.proof;
-              const result: { sent: string; recv: string } =
-                await verifyProof(proof);
+          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: {
@@ -128,369 +82,17 @@ const Offscreen = () => {
                   },
                 },
               });
-            })();
-            break;
-          }
-          case OffscreenActionTypes.start_p2p_verifier: {
-            (async () => {
-              const { pluginHash, maxSentData, maxRecvData, verifierUrl } =
-                request.data;
-
-              const verifier: _Verifier = await new Verifier({
-                id: pluginHash,
-                max_sent_data: maxSentData,
-                max_recv_data: maxRecvData,
-              });
-
-              await verifier.connect(verifierUrl);
-              // await new Promise((r) => setTimeout(r, 10000));
-              const proverStarted = waitForEvent(
-                OffscreenActionTypes.prover_started,
-              );
-
-              verifier.verify().then((res) => {
-                console.log(res);
-
-                browser.runtime.sendMessage({
-                  type: BackgroundActiontype.proof_request_end,
-                  data: {
-                    pluginHash,
-                    proof: res,
-                  },
-                });
-              });
-
-              browser.runtime.sendMessage({
-                type: BackgroundActiontype.verifier_started,
-                data: {
-                  pluginHash,
-                },
-              });
-
-              await proverStarted;
-
-              browser.runtime.sendMessage({
-                type: BackgroundActiontype.start_proof_request,
-                data: {
-                  pluginHash,
-                },
-              });
-            })();
-            break;
-          }
-          case OffscreenActionTypes.start_p2p_prover: {
-            (async () => {
-              const {
-                pluginHash,
-                url,
-                method,
-                headers,
-                body,
-                proverUrl,
-                websocketProxyUrl,
-                maxRecvData,
-                maxSentData,
-                secretHeaders,
-                secretResps,
-              } = request.data;
-
-              const hostname = urlify(url)?.hostname || '';
-              const prover: _Prover = await new Prover({
-                id: pluginHash,
-                serverDns: hostname,
-                maxSentData,
-                maxRecvData,
-              });
-
-              const proofRequestStart = waitForEvent(
-                OffscreenActionTypes.start_p2p_proof_request,
-              );
-
-              const proverSetup = prover.setup(proverUrl);
-              // await new Promise((r) => setTimeout(r, 10000));
-
-              await proverSetup;
-              browser.runtime.sendMessage({
-                type: BackgroundActiontype.prover_started,
-                data: {
-                  pluginHash,
-                },
-              });
-              await proofRequestStart;
-
-              await prover.sendRequest(
-                websocketProxyUrl + `?token=${hostname}`,
-                {
-                  url,
-                  method,
-                  headers,
-                  body,
-                },
-              );
-
-              const transcript = await prover.transcript();
-
-              const commit = {
-                sent: subtractRanges(
-                  transcript.ranges.sent.all,
-                  secretHeaders
-                    .map((secret: string) => {
-                      const index = transcript.sent.indexOf(secret);
-                      return index > -1
-                        ? {
-                            start: index,
-                            end: index + secret.length,
-                          }
-                        : null;
-                    })
-                    .filter((data: any) => !!data) as {
-                    start: number;
-                    end: number;
-                  }[],
-                ),
-                recv: subtractRanges(
-                  transcript.ranges.recv.all,
-                  secretResps
-                    .map((secret: string) => {
-                      const index = transcript.recv.indexOf(secret);
-                      return index > -1
-                        ? {
-                            start: index,
-                            end: index + secret.length,
-                          }
-                        : null;
-                    })
-                    .filter((data: any) => !!data) as {
-                    start: number;
-                    end: number;
-                  }[],
-                ),
-              };
-
-              const endRequest = waitForEvent(
-                OffscreenActionTypes.end_p2p_proof_request,
-              );
-              await prover.reveal(commit);
-              console.log(await endRequest);
-            })();
-            break;
-          }
-          default:
-            break;
+            }
+          })();
+          break;
         }
-      });
-    })();
+        default:
+          break;
+      }
+    });
   }, []);
 
   return <div className="App" />;
 };
 
 export default Offscreen;
-
-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;
-}
-
-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<ProofV1> {
-  const {
-    url,
-    method = 'GET',
-    headers = {},
-    body,
-    maxSentData,
-    maxRecvData,
-    notaryUrl,
-    websocketProxyUrl,
-    id,
-    secretHeaders = [],
-    secretResps = [],
-  } = options;
-
-  const hostname = urlify(url)?.hostname || '';
-  const notary = NotaryServer.from(notaryUrl);
-  const prover: _Prover = await new Prover({
-    id,
-    serverDns: hostname,
-    maxSentData,
-    maxRecvData,
-  });
-
-  await prover.setup(await notary.sessionUrl(maxSentData, maxRecvData));
-
-  await prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
-    url,
-    method,
-    headers,
-    body,
-  });
-
-  const transcript = await prover.transcript();
-
-  const commit = {
-    sent: subtractRanges(
-      transcript.ranges.sent.all,
-      secretHeaders
-        .map((secret: string) => {
-          const index = transcript.sent.indexOf(secret);
-          return index > -1
-            ? {
-                start: index,
-                end: index + secret.length,
-              }
-            : null;
-        })
-        .filter((data: any) => !!data) as { start: number; end: number }[],
-    ),
-    recv: subtractRanges(
-      transcript.ranges.recv.all,
-      secretResps
-        .map((secret: string) => {
-          const index = transcript.recv.indexOf(secret);
-          return index > -1
-            ? {
-                start: index,
-                end: index + secret.length,
-              }
-            : null;
-        })
-        .filter((data: any) => !!data) as { start: number; end: number }[],
-    ),
-  };
-
-  const session: _NotarizedSession = await new NotarizedSession(
-    await prover.notarize(commit),
-  );
-
-  const proofHex = await session.proof(commit);
-  const proof: ProofV1 = {
-    version: '1.0',
-    meta: {
-      notaryUrl,
-      websocketProxyUrl,
-    },
-    data: proofHex,
-  };
-  return proof;
-}
-
-function getCommitFromTranscript(
-  transcript: {
-    sent: string;
-    recv: string;
-    ranges: { recv: ParsedTranscriptData; sent: ParsedTranscriptData };
-  },
-  secretHeaders: string[],
-  secretResps: string[],
-) {
-  const commit = {
-    sent: subtractRanges(
-      transcript.ranges.sent.all,
-      secretHeaders
-        .map((secret: string) => {
-          const index = transcript.sent.indexOf(secret);
-          return index > -1
-            ? {
-                start: index,
-                end: index + secret.length,
-              }
-            : null;
-        })
-        .filter((data: any) => !!data) as {
-        start: number;
-        end: number;
-      }[],
-    ),
-    recv: subtractRanges(
-      transcript.ranges.recv.all,
-      secretResps
-        .map((secret: string) => {
-          const index = transcript.recv.indexOf(secret);
-          return index > -1
-            ? {
-                start: index,
-                end: index + secret.length,
-              }
-            : null;
-        })
-        .filter((data: any) => !!data) as {
-        start: number;
-        end: number;
-      }[],
-    ),
-  };
-
-  return commit;
-}
-
-async function verifyProof(
-  proof: Proof,
-): Promise<{ sent: string; recv: string }> {
-  let result: { sent: string; recv: string };
-
-  switch (proof.version) {
-    case undefined: {
-      result = await verify(proof);
-      break;
-    }
-    case '1.0': {
-      const tlsProof: _TlsProof = await new TlsProof(proof.data);
-      result = await tlsProof.verify({
-        typ: 'P256',
-        key: await NotaryServer.from(proof.meta.notaryUrl).publicKey(),
-      });
-      break;
-    }
-  }
-
-  return result;
-}

src/entries/Offscreen/types.ts

@@ -1,9 +0,0 @@
-export enum OffscreenActionTypes {
-  notarization_request = 'offscreen/notarization_request',
-  notarization_response = 'offscreen/notarization_response',
-  start_p2p_verifier = 'offscreen/start_p2p_verifier',
-  start_p2p_prover = 'offscreen/start_p2p_prover',
-  prover_started = 'offscreen/prover_started',
-  start_p2p_proof_request = 'offscreen/start_p2p_proof_request',
-  end_p2p_proof_request = 'offscreen/end_p2p_proof_request',
-}

src/entries/Offscreen/worker.ts

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

src/entries/Options/index.tsx

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

src/entries/Popup/Popup.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { Navigate, Route, Routes, useNavigate } from 'react-router';
 import { useDispatch } from 'react-redux';
 import {
@@ -18,32 +18,17 @@ import Notarize from '../../pages/Notarize';
 import ProofViewer from '../../pages/ProofViewer';
 import History from '../../pages/History';
 import ProofUploader from '../../pages/ProofUploader';
+import Connect from '../../pages/Connect';
 import browser from 'webextension-polyfill';
-import store from '../../utils/store';
-import PluginUploadInfo from '../../components/PluginInfo';
-import ConnectionDetailsModal from '../../components/ConnectionDetailsModal';
-import { ConnectionApproval } from '../../pages/ConnectionApproval';
-import { GetHistoryApproval } from '../../pages/GetHistoryApproval';
-import { GetProofApproval } from '../../pages/GetProofApproval';
-import { NotarizeApproval } from '../../pages/NotarizeApproval';
-import { InstallPluginApproval } from '../../pages/InstallPluginApproval';
-import { GetPluginsApproval } from '../../pages/GetPluginsApproval';
-import { RunPluginApproval } from '../../pages/RunPluginApproval';
-import Icon from '../../components/Icon';
-import classNames from 'classnames';
-import { getConnection } from '../Background/db';
-import { useIsConnected, setConnection } from '../../reducers/requests';
-import { P2PHome } from '../../pages/PeerToPeer';
-import { fetchP2PState } from '../../reducers/p2p';
+import P2P from '../../pages/P2P';
+import CreateSession from '../../pages/CreateSession';
 
 const Popup = () => {
   const dispatch = useDispatch();
+  const activeTab = useActiveTab();
+  const url = useActiveTabUrl();
   const navigate = useNavigate();
 
-  useEffect(() => {
-    fetchP2PState();
-  }, []);
-
   useEffect(() => {
     (async () => {
       const [tab] = await browser.tabs.query({
@@ -67,28 +52,6 @@ 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-nowrap flex-shrink-0 flex-row items-center relative gap-2 h-9 p-2 cursor-default justify-center bg-slate-300 w-full">
@@ -98,7 +61,16 @@ const Popup = () => {
           alt="logo"
           onClick={() => navigate('/')}
         />
-        <AppConnectionLogo />
+        <div className="absolute right-2 flex flex-nowrap flex-row items-center gap-1 justify-center w-fit">
+          {!!activeTab?.favIconUrl && (
+            <img
+              src={activeTab?.favIconUrl}
+              className="h-5 rounded-full"
+              alt="logo"
+            />
+          )}
+          <div className="text-xs">{url?.hostname}</div>
+        </div>
       </div>
       <Routes>
         <Route path="/requests/:requestId/*" element={<Request />} />
@@ -110,18 +82,9 @@ const Popup = () => {
         <Route path="/custom/*" element={<RequestBuilder />} />
         <Route path="/options" element={<Options />} />
         <Route path="/home" element={<Home />} />
-        <Route path="/plugininfo" element={<PluginUploadInfo />} />
-        <Route path="/connection-approval" element={<ConnectionApproval />} />
-        <Route path="/get-history-approval" element={<GetHistoryApproval />} />
-        <Route path="/get-proof-approval" element={<GetProofApproval />} />
-        <Route path="/notarize-approval" element={<NotarizeApproval />} />
-        <Route path="/get-plugins-approval" element={<GetPluginsApproval />} />
-        <Route path="/run-plugin-approval" element={<RunPluginApproval />} />
-        <Route path="/p2p" element={<P2PHome />} />
-        <Route
-          path="/install-plugin-approval"
-          element={<InstallPluginApproval />}
-        />
+        <Route path="/connect-session" element={<Connect />} />
+        <Route path="/create-session" element={<CreateSession />} />
+        <Route path="/p2p" element={<P2P />} />
         <Route path="*" element={<Navigate to="/home" />} />
       </Routes>
     </div>
@@ -129,58 +92,3 @@ const Popup = () => {
 };
 
 export default Popup;
-
-function AppConnectionLogo() {
-  const dispatch = useDispatch();
-  const activeTab = useActiveTab();
-  const url = useActiveTabUrl();
-  const [showConnectionDetails, setShowConnectionDetails] = useState(false);
-  const connected = useIsConnected();
-
-  useEffect(() => {
-    (async () => {
-      if (url) {
-        const isConnected: boolean | null = await getConnection(url?.origin);
-        dispatch(setConnection(!!isConnected));
-      }
-    })();
-  }, [url]);
-
-  return (
-    <div
-      className="absolute right-2 flex flex-nowrap flex-row items-center gap-1 justify-center w-fit cursor-pointer"
-      onClick={() => setShowConnectionDetails(true)}
-    >
-      <div className="flex flex-row relative bg-black border-[1px] border-black rounded-full">
-        {!!activeTab?.favIconUrl ? (
-          <img
-            src={activeTab?.favIconUrl}
-            className="h-5 rounded-full"
-            alt="logo"
-          />
-        ) : (
-          <Icon
-            fa="fa-solid fa-globe"
-            className="bg-white text-slate-400 rounded-full"
-            size={1.25}
-          />
-        )}
-        <div
-          className={classNames(
-            'absolute right-[-2px] bottom-[-2px] rounded-full h-[10px] w-[10px] border-[2px]',
-            {
-              'bg-green-500': connected,
-              'bg-slate-500': !connected,
-            },
-          )}
-        />
-      </div>
-      {showConnectionDetails && (
-        <ConnectionDetailsModal
-          showConnectionDetails={showConnectionDetails}
-          setShowConnectionDetails={setShowConnectionDetails}
-        />
-      )}
-    </div>
-  );
-}

src/entries/Popup/index.html

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

src/entries/Popup/index.tsx

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

@@ -1,337 +0,0 @@
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
-import './sidePanel.scss';
-import browser from 'webextension-polyfill';
-import {
-  getPluginConfig,
-  hexToArrayBuffer,
-  makePlugin,
-  PluginConfig,
-  sha256,
-  StepConfig,
-} from '../../utils/misc';
-import { PluginList } from '../../components/PluginList';
-import DefaultPluginIcon from '../../assets/img/default-plugin-icon.png';
-import logo from '../../assets/img/icon-128.png';
-import classNames from 'classnames';
-import Icon from '../../components/Icon';
-import { useRequestHistory } from '../../reducers/history';
-import { BackgroundActiontype } from '../Background/rpc';
-import { getPluginByHash, getPluginConfigByHash } from '../Background/db';
-import { SidePanelActionTypes } from './types';
-import {
-  fetchP2PState,
-  useClientId,
-  useIncomingProofRequests,
-} from '../../reducers/p2p';
-
-export default function SidePanel(): ReactElement {
-  const [config, setConfig] = useState<PluginConfig | null>(null);
-  const [hash, setHash] = useState('');
-  const [hex, setHex] = useState('');
-  const [p2p, setP2P] = useState(false);
-  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 getPluginConfigByHash(data.pluginHash));
-          setHash(data.pluginHash);
-          setStarted(true);
-          break;
-        }
-        case SidePanelActionTypes.run_p2p_plugin_request: {
-          const { pluginHash, plugin } = data;
-          const config =
-            (await getPluginConfigByHash(pluginHash)) ||
-            (await getPluginConfig(hexToArrayBuffer(plugin)));
-
-          setHash(pluginHash);
-          setHex(plugin);
-          setP2P(true);
-          setConfig(config);
-          break;
-        }
-        case SidePanelActionTypes.start_p2p_plugin: {
-          setStarted(true);
-          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
-          hash={hash}
-          hex={hex}
-          config={config}
-          p2p={p2p}
-          clientId={clientId}
-        />
-      )}
-    </div>
-  );
-}
-
-function PluginBody(props: {
-  config: PluginConfig;
-  hash: string;
-  hex?: string;
-  clientId?: string;
-  p2p?: boolean;
-}): ReactElement {
-  const { hash, hex, config, p2p, clientId } = props;
-  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);
-      }
-    },
-    [hash, responses],
-  );
-
-  useEffect(() => {
-    if (notaryRequest?.status === 'success') {
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_response,
-        data: {
-          hash,
-          proof: notaryRequest.proof,
-        },
-      });
-    } else if (notaryRequest?.status === 'error') {
-      browser.runtime.sendMessage({
-        type: SidePanelActionTypes.execute_plugin_response,
-        data: {
-          hash,
-          error: notaryRequest.error,
-        },
-      });
-    }
-  }, [hash, 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
-            hash={hash}
-            config={config}
-            hex={hex}
-            index={i}
-            setResponse={setResponse}
-            lastResponse={i > 0 ? responses[i - 1] : undefined}
-            responses={responses}
-            p2p={p2p}
-            clientId={clientId}
-            {...step}
-          />
-        ))}
-      </div>
-    </div>
-  );
-}
-
-function StepContent(
-  props: StepConfig & {
-    hash: string;
-    hex?: string;
-    clientId?: string;
-    index: number;
-    setResponse: (resp: any, i: number) => void;
-    responses: any[];
-    lastResponse?: any;
-    config: PluginConfig;
-    p2p?: boolean;
-  },
-): ReactElement {
-  const {
-    index,
-    title,
-    description,
-    cta,
-    action,
-    setResponse,
-    lastResponse,
-    prover,
-    hash,
-    hex: _hex,
-    config,
-    p2p = false,
-    clientId = '',
-  } = 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 getPluginByHash(hash)) || _hex;
-    const arrayBuffer = hexToArrayBuffer(hex!);
-    return makePlugin(arrayBuffer, config, { p2p, clientId });
-  }, [hash, _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, JSON.stringify(lastResponse));
-      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]);
-
-  useEffect(() => {
-    processStep();
-  }, [processStep]);
-
-  let btnContent = null;
-
-  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 Proof</span>
-      </button>
-    );
-  } else if (notaryRequest?.status === 'pending' || pending || notarizationId) {
-    btnContent = (
-      <button className="button mt-2 w-fit flex flex-row flex-nowrap items-center gap-2 cursor-default">
-        <Icon className="animate-spin" fa="fa-solid fa-spinner" size={1} />
-        <span className="text-sm">{cta}</span>
-      </button>
-    );
-  } else {
-    btnContent = (
-      <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

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

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

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

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

src/entries/utils.ts

@@ -1,62 +0,0 @@
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from './Background/rpc';
-import { SidePanelActionTypes } from './SidePanel/types';
-import { deferredPromise } from '../utils/promise';
-import { devlog } from '../utils/misc';
-
-export const pushToRedux = async (action: {
-  type: string;
-  payload?: any;
-  error?: boolean;
-  meta?: any;
-}) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.push_action,
-    data: {
-      tabId: 'background',
-    },
-    action,
-  });
-};
-
-export const openSidePanel = async () => {
-  const { promise, resolve, reject } = deferredPromise();
-
-  try {
-    const [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,16 +3,11 @@
   "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"
   },
@@ -28,8 +23,8 @@
   ],
   "web_accessible_resources": [
     {
-      "resources": ["content.styles.css", "icon-128.png", "icon-34.png", "content.bundle.js", "discord_dm.wasm", "twitter_profile.wasm"],
-      "matches": ["http://*/*", "https://*/*", "<all_urls>"]
+      "resources": ["content.styles.css", "icon-128.png", "icon-34.png"],
+      "matches": []
     }
   ],
   "host_permissions": ["<all_urls>"],
@@ -37,7 +32,6 @@
     "offscreen",
     "storage",
     "webRequest",
-    "activeTab",
-    "sidePanel"
+    "activeTab"
   ]
 }

src/pages/BaseApproval/index.tsx

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

src/pages/Connect/index.tsx

@@ -0,0 +1,64 @@
+import React, { useEffect, useState, useCallback } from 'react';
+import { sendPairRequest } from '../../reducers/p2p';
+import { useDispatch } from 'react-redux';
+import { useNavigate } from 'react-router';
+import { usePairId } from '../../reducers/p2p';
+import Icon from '../../components/Icon';
+
+export default function Connect() {
+  const dispatch = useDispatch();
+  const [peerId, setPeerId] = useState('');
+  const [loading, setLoading] = useState(false);
+
+  const pairId = usePairId();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (pairId && loading) {
+      console.log('Connected to peer', pairId);
+      setLoading(false);
+      navigate('/create-session');
+    }
+  }, [pairId]);
+
+  const connect = useCallback(() => {
+    if (peerId) {
+      console.log('Connecting to peer', peerId);
+      dispatch(sendPairRequest(peerId));
+      setLoading(true);
+    } else {
+      console.log('No peer ID provided');
+    }
+  }, [peerId]);
+
+  return (
+    <div className="flex flex-col justify-center items-center bg-slate-200 p-4 rounded border-slate-400 m-4 gap-2">
+      <h1 className="text-base font-semibold">Enter peer ID to connect to</h1>
+      <input
+        className="input border border-slate-200 focus:border-slate-400 w-full"
+        type="text"
+        value={peerId}
+        onChange={(e) => setPeerId(e.target.value)}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter') connect();
+        }}
+        autoFocus
+      />
+      <button
+        className="button button--primary"
+        disabled={!peerId || loading}
+        onClick={connect}
+      >
+        {loading ? (
+          <Icon
+            className="animate-spin text-white"
+            fa="fa-solid fa-spinner"
+            size={1}
+          />
+        ) : (
+          'Connect'
+        )}
+      </button>
+    </div>
+  );
+}

src/pages/ConnectionApproval/index.tsx

@@ -1,62 +0,0 @@
-import React, { ReactElement, useCallback } from 'react';
-import Icon from '../../components/Icon';
-import logo from '../../assets/img/icon-128.png';
-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';
-
-export function ConnectionApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const hostname = urlify(origin || '')?.hostname;
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.connect_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.connect_response,
-      data: true,
-    });
-  }, []);
-
-  return (
-    <BaseApproval
-      header={`Connecting to ${hostname}`}
-      onSecondaryClick={onCancel}
-      onPrimaryClick={onAccept}
-    >
-      <div className="flex flex-col items-center gap-2 py-8">
-        {!!favIconUrl ? (
-          <img
-            src={favIconUrl}
-            className="h-16 w-16 border border-slate-200 bg-slate-200 rounded-full"
-            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-sm font-semibold">{hostname}</div>
-      </div>
-      <div className="text-lg font-bold text-center">Connect to this site?</div>
-      <div className="text-sm px-8 text-center text-slate-500 flex-grow">
-        Do you trust this site? By granting this permission, you're allowing
-        this site to view your installed plugins, suggest requests to notarize,
-        suggest plugins to install, ask you to share proofs metadata{' '}
-        <i>(method, url, notary url, and proxy url)</i>, and ask to view a
-        specific proof.
-      </div>
-    </BaseApproval>
-  );
-}

src/pages/CreateSession/index.tsx

@@ -0,0 +1,7 @@
+import type {} from 'redux-thunk/extend-redux';
+import React, { ReactElement, useEffect } from 'react';
+import ChatBox from '../../components/ChatBox';
+
+export default function CreateSession(): ReactElement {
+  return <ChatBox />;
+}

src/pages/GetHistoryApproval/index.tsx

@@ -1,139 +0,0 @@
-import React, { ReactElement, useCallback, useEffect } from 'react';
-import Icon from '../../components/Icon';
-import { useSearchParams } from 'react-router-dom';
-import { safeParseJSON, urlify } from '../../utils/misc';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-import { BaseApproval } from '../BaseApproval';
-import { minimatch } from 'minimatch';
-import { useAllProofHistory } from '../../reducers/history';
-import classNames from 'classnames';
-
-export function GetHistoryApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const method = params.get('method');
-  const url = params.get('url');
-  const rawMetadata = params.get('metadata');
-  const metadata = safeParseJSON(rawMetadata);
-  const hostname = urlify(origin || '')?.hostname;
-  const proofs = useAllProofHistory();
-
-  useEffect(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_prove_requests,
-    });
-  }, []);
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_history_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_history_response,
-      data: true,
-    });
-  }, []);
-
-  const result = proofs.filter((proof) => {
-    let matchedMetadata = true;
-    if (metadata) {
-      matchedMetadata = Object.entries(
-        metadata as { [k: string]: string },
-      ).reduce((bool, [k, v]) => {
-        try {
-          return bool && minimatch(proof.metadata![k], v);
-        } catch (e) {
-          return false;
-        }
-      }, matchedMetadata);
-    }
-
-    return (
-      minimatch(proof.method, method!, { nocase: true }) &&
-      minimatch(proof.url, url!) &&
-      matchedMetadata
-    );
-  });
-
-  return (
-    <BaseApproval
-      header="Requesting Proof History"
-      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">
-          Do you want to share proof history with{' '}
-          <b className="text-blue-500">{hostname}</b>?
-        </div>
-      </div>
-      <div className="flex flex-col items-center gap-4 text-sm px-8 text-center flex-grow">
-        <div className="text-slate-500">
-          All proofs matching the following patterns with be shared:
-        </div>
-        <table className="border border-collapse table-auto rounded text-xs w-full">
-          <tbody>
-            <tr>
-              <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top w-16 text-left">
-                Method
-              </td>
-              <td className="px-2 py-1 border border-slate-300 font-semibold text-black font-mono text-left">
-                {method?.toUpperCase()}
-              </td>
-            </tr>
-            <tr className="">
-              <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top w-16 text-left">
-                URL
-              </td>
-              <td className="px-2 py-1 border border-slate-300 font-semibold text-black font-mono break-all text-left">
-                {url}
-              </td>
-            </tr>
-            {rawMetadata && (
-              <tr className="">
-                <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top w-16 text-left">
-                  Metadata
-                </td>
-                <td className="px-2 py-1 border border-slate-300 font-semibold text-black font-mono break-all text-left">
-                  {rawMetadata}
-                </td>
-              </tr>
-            )}
-          </tbody>
-        </table>
-        <div
-          className={classNames('border rounded font-semibold px-2 py-1', {
-            'text-green-500 bg-green-200 border-green-300': result.length,
-            'text-slate-500 bg-slate-200 border-slate-300': !result.length,
-          })}
-        >
-          {result.length} results found
-        </div>
-      </div>
-      <div className="text-xs px-8 pb-2 text-center text-slate-500">
-        Only certain metadata will be shared with the app, such as <i>id</i>,{' '}
-        <i>method</i>, <i>url</i>, <i>notary</i>, <i>proxy</i>, and{' '}
-        <i>timestamp</i>.
-      </div>
-    </BaseApproval>
-  );
-}

src/pages/GetPluginsApproval/index.tsx

@@ -1,138 +0,0 @@
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
-import Icon from '../../components/Icon';
-import { useSearchParams } from 'react-router-dom';
-import { safeParseJSON, urlify } from '../../utils/misc';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-import { BaseApproval } from '../BaseApproval';
-import { getPlugins } from '../../entries/Background/db';
-import { minimatch } from 'minimatch';
-import classNames from 'classnames';
-
-export function GetPluginsApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const url = params.get('url');
-  const filterOrigin = params.get('filterOrigin');
-  const rawMetadata = params.get('metadata');
-  const filterMetadata = safeParseJSON(rawMetadata);
-  const hostname = urlify(origin || '')?.hostname;
-  const [result, setResult] = useState<any[]>([]);
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_plugins_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_plugins_response,
-      data: true,
-    });
-  }, []);
-
-  useEffect(() => {
-    (async () => {
-      const response = await getPlugins();
-      const res = response.filter(({ metadata }) => {
-        let matchedMetadata = true;
-        if (filterMetadata) {
-          matchedMetadata = Object.entries(
-            filterMetadata as { [k: string]: string },
-          ).reduce((bool, [k, v]) => {
-            try {
-              return bool && minimatch(metadata![k], v);
-            } catch (e) {
-              return false;
-            }
-          }, matchedMetadata);
-        }
-        return (
-          minimatch(metadata.filePath, url || '**') &&
-          minimatch(metadata.origin, filterOrigin || '**') &&
-          matchedMetadata
-        );
-      });
-      setResult(res);
-    })();
-  }, [url, filterMetadata]);
-
-  return (
-    <BaseApproval
-      header="Requesting Plugins"
-      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">
-          Do you want to share installed plugins with{' '}
-          <b className="text-blue-500">{hostname}</b>?
-        </div>
-      </div>
-      <div className="flex flex-col items-center gap-4 text-sm px-8 text-center flex-grow">
-        <div className="text-slate-500">
-          All plugins matching the following patterns with be shared:
-        </div>
-        <table className="border border-collapse table-auto rounded text-xs w-full">
-          <tbody>
-            <tr className="">
-              <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top w-16 text-left">
-                URL
-              </td>
-              <td className="px-2 py-1 border border-slate-300 font-semibold text-black font-mono break-all text-left">
-                {url}
-              </td>
-            </tr>
-            <tr className="">
-              <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top w-16 text-left">
-                Origin
-              </td>
-              <td className="px-2 py-1 border border-slate-300 font-semibold text-black font-mono break-all text-left">
-                {filterOrigin}
-              </td>
-            </tr>
-            {rawMetadata && (
-              <tr className="">
-                <td className="px-2 py-1 border border-slate-300 bg-slate-100 text-slate-500 align-top w-16 text-left">
-                  Metadata
-                </td>
-                <td className="px-2 py-1 border border-slate-300 font-semibold text-black font-mono break-all text-left">
-                  {rawMetadata}
-                </td>
-              </tr>
-            )}
-          </tbody>
-        </table>
-        <div
-          className={classNames('border rounded font-semibold px-2 py-1', {
-            'text-green-500 bg-green-200 border-green-300': result.length,
-            'text-slate-500 bg-slate-200 border-slate-300': !result.length,
-          })}
-        >
-          {result.length} results found
-        </div>
-      </div>
-      <div className="text-xs px-8 pb-2 text-center text-slate-500">
-        Only certain metadata will be shared with the app, such as <i>id</i>,{' '}
-        <i>method</i>, <i>url</i>, <i>notary</i>, <i>proxy</i>, and{' '}
-        <i>timestamp</i>.
-      </div>
-    </BaseApproval>
-  );
-}

src/pages/GetProofApproval/index.tsx

@@ -1,68 +0,0 @@
-import React, { ReactElement, useCallback, useEffect } 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 { OneRequestHistory } from '../History';
-
-export function GetProofApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const id = params.get('id');
-  const hostname = urlify(origin || '')?.hostname;
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_proof_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.get_proof_response,
-      data: true,
-    });
-  }, []);
-
-  return (
-    <BaseApproval
-      header="Requesting Proof History"
-      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">
-          Do you want to share proof data with{' '}
-          <b className="text-blue-500">{hostname}</b>?
-        </div>
-      </div>
-      <div className="flex flex-col items-center gap-4 text-sm px-8 text-center flex-grow">
-        <div className="text-slate-500">
-          The following proof will be shared:
-        </div>
-        <OneRequestHistory
-          className="w-full !cursor-default hover:bg-white text-xs"
-          requestId={id!}
-          hideActions={['share', 'delete', 'retry']}
-        />
-      </div>
-    </BaseApproval>
-  );
-}

src/pages/History/index.tsx

@@ -1,4 +1,4 @@
-import React, { ReactElement, useState, useCallback, useEffect } from 'react';
+import React, { ReactElement, useState, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router';
 import {
@@ -7,18 +7,13 @@ import {
   deleteRequestHistory,
 } from '../../reducers/history';
 import Icon from '../../components/Icon';
-import { getNotaryApi, getProxyApi } from '../../utils/storage';
+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 Modal, { ModalContent } from '../../components/Modal/Modal';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
 import { EXPLORER_API } from '../../utils/constants';
-import {
-  getNotaryRequest,
-  setNotaryRequestCid,
-} from '../../entries/Background/db';
-const charwise = require('charwise');
 
 export default function History(): ReactElement {
   const history = useHistoryOrder();
@@ -32,41 +27,22 @@ export default function History(): ReactElement {
   );
 }
 
-export function OneRequestHistory(props: {
-  requestId: string;
-  className?: string;
-  hideActions?: string[];
-}): ReactElement {
-  const { hideActions = [] } = props;
+function OneRequestHistory(props: { requestId: string }): ReactElement {
   const dispatch = useDispatch();
   const request = useRequestHistory(props.requestId);
   const [showingError, showError] = useState(false);
   const [uploadError, setUploadError] = useState('');
   const [showingShareConfirmation, setShowingShareConfirmation] =
     useState(false);
-  const [cid, setCid] = useState<{ [key: string]: string }>({});
+  const [cid, setCid] = useState('');
   const [uploading, setUploading] = useState(false);
   const navigate = useNavigate();
   const { status } = request || {};
   const requestUrl = urlify(request?.url || '');
 
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        const request = await getNotaryRequest(props.requestId);
-        if (request && request.cid) {
-          setCid({ [props.requestId]: request.cid });
-        }
-      } catch (e) {
-        console.error('Error fetching data', e);
-      }
-    };
-    fetchData();
-  }, []);
-
   const onRetry = useCallback(async () => {
-    const notaryUrl = await getNotaryApi();
-    const websocketProxyUrl = await getProxyApi();
+    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: {
@@ -105,22 +81,16 @@ export function OneRequestHistory(props: {
         `${request?.id}.json`,
         JSON.stringify(request?.proof),
       );
-      setCid((prevCid) => ({ ...prevCid, [props.requestId]: data }));
-      await setNotaryRequestCid(props.requestId, data);
+      setCid(data);
     } catch (e: any) {
       setUploadError(e.message);
     } finally {
       setUploading(false);
     }
-  }, [props.requestId, request, cid]);
+  }, []);
 
   return (
-    <div
-      className={classNames(
-        'flex flex-row flex-nowrap border rounded-md p-2 gap-1 hover:bg-slate-50 cursor-pointer',
-        props.className,
-      )}
-    >
+    <div className="flex flex-row flex-nowrap border rounded-md p-2 gap-1 hover:bg-slate-50 cursor-pointer">
       <ShareConfirmationModal />
       <ErrorModal />
       <div className="flex flex-col flex-nowrap flex-grow flex-shrink w-0">
@@ -132,12 +102,6 @@ export function OneRequestHistory(props: {
             {requestUrl?.pathname}
           </div>
         </div>
-        <div className="flex flex-row">
-          <div className="font-bold text-slate-400">Time:</div>
-          <div className="ml-2 text-slate-800">
-            {new Date(charwise.decode(props.requestId, 'hex')).toISOString()}
-          </div>
-        </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>
@@ -147,7 +111,7 @@ export function OneRequestHistory(props: {
           <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="font-bold text-slate-400">TLS Proxy API: </div>
           <div className="ml-2 text-slate-800">
             {request?.websocketProxyUrl}
           </div>
@@ -161,7 +125,6 @@ export function OneRequestHistory(props: {
               onClick={onView}
               fa="fa-solid fa-receipt"
               ctaText="View Proof"
-              hidden={hideActions.includes('view')}
             />
             <ActionButton
               className="bg-slate-100 text-slate-300 hover:bg-slate-200 hover:text-slate-500"
@@ -170,42 +133,35 @@ export function OneRequestHistory(props: {
               }
               fa="fa-solid fa-download"
               ctaText="Download"
-              hidden={hideActions.includes('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"
-              hidden={hideActions.includes('share')}
             />
           </>
         )}
-        {status === 'error' && !!request?.error && (
-          <ErrorButton hidden={hideActions.includes('error')} />
-        )}
-        {(!status || status === 'error') && (
-          <RetryButton hidden={hideActions.includes('retry')} />
-        )}
+        {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>
         )}
-        <ActionButton
+        <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}
-          fa="fa-solid fa-trash"
-          ctaText="Delete"
-          hidden={hideActions.includes('delete')}
-        />
+        >
+          <Icon className="" fa="fa-solid fa-trash" size={1} />
+          <span className="text-xs font-bold">Delete</span>
+        </button>
       </div>
     </div>
   );
 
-  function RetryButton(p: { hidden?: boolean }): ReactElement {
-    if (p.hidden) return <></>;
+  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"
@@ -217,8 +173,7 @@ export function OneRequestHistory(props: {
     );
   }
 
-  function ErrorButton(p: { hidden?: boolean }): ReactElement {
-    if (p.hidden) return <></>;
+  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"
@@ -231,7 +186,6 @@ export function OneRequestHistory(props: {
   }
 
   function ErrorModal(): ReactElement {
-    const msg = typeof request?.error === 'string' && request?.error;
     return !showingError ? (
       <></>
     ) : (
@@ -240,7 +194,7 @@ export function OneRequestHistory(props: {
         onClose={closeAllModal}
       >
         <ModalContent className="flex justify-center items-center text-slate-500">
-          {msg || 'Something went wrong :('}
+          {request?.error || 'Something went wrong :('}
         </ModalContent>
         <button
           className="m-0 w-24 bg-red-100 text-red-300 hover:bg-red-200 hover:text-red-500"
@@ -261,7 +215,7 @@ export function OneRequestHistory(props: {
         onClose={closeAllModal}
       >
         <ModalContent className="flex flex-col w-full gap-4 items-center text-base justify-center">
-          {!cid[props.requestId] ? (
+          {!cid ? (
             <p className="text-slate-500 text-center">
               {uploadError ||
                 'This will make your proof publicly accessible by anyone with the CID'}
@@ -270,13 +224,13 @@ export function OneRequestHistory(props: {
             <input
               className="input w-full bg-slate-100 border border-slate-200"
               readOnly
-              value={`${EXPLORER_API}/ipfs/${cid[props.requestId]}`}
+              value={`${EXPLORER_API}/ipfs/${cid}`}
               onFocus={(e) => e.target.select()}
             />
           )}
         </ModalContent>
         <div className="flex flex-row gap-2 justify-center">
-          {!cid[props.requestId] ? (
+          {!cid ? (
             <>
               {!uploadError && (
                 <button
@@ -304,9 +258,7 @@ export function OneRequestHistory(props: {
           ) : (
             <>
               <button
-                onClick={() =>
-                  copy(`${EXPLORER_API}/ipfs/${cid[props.requestId]}`)
-                }
+                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
@@ -330,10 +282,7 @@ function ActionButton(props: {
   fa: string;
   ctaText: string;
   className?: string;
-  hidden?: boolean;
 }): ReactElement {
-  if (props.hidden) return <></>;
-
   return (
     <button
       className={classNames(

src/pages/Home/index.tsx

@@ -2,36 +2,44 @@ import React, {
   MouseEventHandler,
   ReactElement,
   ReactNode,
+  useCallback,
   useState,
 } from 'react';
 import Icon from '../../components/Icon';
 import classNames from 'classnames';
 import { useNavigate } from 'react-router';
-import { useRequests } from '../../reducers/requests';
-import { PluginList } from '../../components/PluginList';
-import PluginUploadInfo from '../../components/PluginInfo';
-import { ErrorModal } from '../../components/ErrorModal';
-import { useClientId } from '../../reducers/p2p';
+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';
 
 export default function Home(): ReactElement {
   const requests = useRequests();
+  const url = useActiveTabUrl();
   const navigate = useNavigate();
-  const [error, showError] = useState('');
-  const clientId = useClientId();
+  const dispatch = useDispatch();
 
   return (
     <div className="flex flex-col gap-4 py-4 overflow-y-auto">
-      {error && <ErrorModal onClose={() => showError('')} message={error} />}
       <div className="flex flex-col flex-nowrap justify-center gap-2 mx-4">
         <NavButton fa="fa-solid fa-table" onClick={() => navigate('/requests')}>
           <span>Requests</span>
           <span>{`(${requests.length})`}</span>
         </NavButton>
-        <NavButton fa="fa-solid fa-hammer" onClick={() => navigate('/custom')}>
+        <NavButton
+          fa="fa-solid fa-magnifying-glass"
+          onClick={() => navigate('/custom')}
+        >
           Custom
         </NavButton>
         <NavButton
-          fa="fa-solid fa-certificate"
+          fa="fa-solid fa-magnifying-glass"
           onClick={() => navigate('/verify')}
         >
           Verify
@@ -39,26 +47,134 @@ export default function Home(): ReactElement {
         <NavButton fa="fa-solid fa-list" onClick={() => navigate('/history')}>
           History
         </NavButton>
-        <NavButton className="relative" fa="fa-solid fa-plus">
-          <PluginUploadInfo />
-          Add a plugin
-        </NavButton>
-        <NavButton
-          className={'relative'}
-          fa="fa-solid fa-circle"
-          iconSize={0.5}
-          iconClassName={classNames({
-            '!text-green-500': clientId,
-          })}
-          onClick={() => navigate('/p2p')}
-        >
-          P2P
-        </NavButton>
         <NavButton fa="fa-solid fa-gear" onClick={() => navigate('/options')}>
           Options
         </NavButton>
+        <NavButton fa="fa-solid fa-wifi" onClick={() => navigate('/p2p')}>
+          Prove to peer
+        </NavButton>
+      </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>
-      <PluginList className="mx-4" />
     </div>
   );
 }
@@ -68,14 +184,12 @@ function NavButton(props: {
   children?: ReactNode;
   onClick?: MouseEventHandler;
   className?: string;
-  iconClassName?: string;
   disabled?: boolean;
-  iconSize?: number;
 }): ReactElement {
   return (
     <button
       className={classNames(
-        'flex flex-row flex-nowrap items-center justify-center relative',
+        'flex flex-row flex-nowrap items-center justify-center',
         'text-white rounded px-2 py-1 gap-1',
         {
           'bg-primary/[.8] hover:bg-primary/[.7] active:bg-primary':
@@ -87,15 +201,8 @@ function NavButton(props: {
       onClick={props.onClick}
       disabled={props.disabled}
     >
-      <Icon
-        className={classNames(
-          'absolute w-6 justify-center left-2',
-          props.iconClassName,
-        )}
-        fa={props.fa}
-        size={props.iconSize || 1}
-      />
-      <span className="flex-grow flex-shrink w-0 font-bold">
+      <Icon className="flex-grow-0 flex-shrink-0" fa={props.fa} size={1} />
+      <span className="flex-grow flex-shrink w-0 flex-grow font-bold">
         {props.children}
       </span>
     </button>

src/pages/InstallPluginApproval/index.tsx

@@ -1,108 +0,0 @@
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
-import Icon from '../../components/Icon';
-import { useSearchParams } from 'react-router-dom';
-import {
-  getPluginConfig,
-  makePlugin,
-  type PluginConfig,
-  urlify,
-} from '../../utils/misc';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-import { BaseApproval } from '../BaseApproval';
-import { PluginPermissions } from '../../components/PluginInfo';
-
-export function InstallPluginApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const url = params.get('url');
-  const rawMetadata = params.get('metadata');
-  const hostname = urlify(origin || '')?.hostname;
-
-  const [error, showError] = useState('');
-  const [pluginBuffer, setPluginBuffer] = useState<ArrayBuffer | any>(null);
-  const [pluginContent, setPluginContent] = useState<PluginConfig | null>(null);
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.install_plugin_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.install_plugin_response,
-      data: true,
-    });
-  }, []);
-
-  useEffect(() => {
-    (async () => {
-      try {
-        const resp = await fetch(url!);
-        const arrayBuffer = await resp.arrayBuffer();
-        const plugin = await makePlugin(arrayBuffer);
-        setPluginContent(await getPluginConfig(plugin));
-        setPluginBuffer(arrayBuffer);
-      } catch (e: any) {
-        showError(e?.message || 'Invalid Plugin');
-      }
-    })();
-  }, [url]);
-
-  return (
-    <BaseApproval
-      header={`Installing 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 install 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 flex-grow gap-4 border border-slate-300 p-8 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-3xl text-blue-600 font-semibold">
-              {pluginContent.title}
-            </span>
-            <div className="text-slate-500 text-lg">
-              {pluginContent.description}
-            </div>
-          </div>
-          <PluginPermissions className="w-full" pluginContent={pluginContent} />
-        </div>
-      )}
-    </BaseApproval>
-  );
-}

src/pages/Notarize/index.tsx

@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import React, {
+  ReactNode,
   ReactElement,
   useState,
   useCallback,
@@ -7,16 +8,11 @@ import React, {
   useEffect,
   useRef,
 } from 'react';
-import { useNavigate, useParams } from 'react-router';
+import { useLocation, useNavigate, useParams } from 'react-router';
 import { notarizeRequest, useRequest } from '../../reducers/requests';
 import Icon from '../../components/Icon';
 import { urlify } from '../../utils/misc';
-import {
-  getNotaryApi,
-  getProxyApi,
-  getMaxSent,
-  getMaxRecv,
-} from '../../utils/storage';
+import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../../utils/storage';
 import { useDispatch } from 'react-redux';
 
 const maxTranscriptSize = 16384;
@@ -33,10 +29,9 @@ export default function Notarize(): ReactElement {
   const notarize = useCallback(async () => {
     if (!req) return;
     const hostname = urlify(req.url)?.hostname;
-    const notaryUrl = await getNotaryApi();
-    const websocketProxyUrl = await getProxyApi();
-    const maxSentData = await getMaxSent();
-    const maxRecvData = await getMaxRecv();
+    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;
@@ -56,8 +51,6 @@ export default function Notarize(): ReactElement {
         method: req.method,
         headers,
         body: req.requestBody,
-        maxSentData,
-        maxRecvData,
         maxTranscriptSize,
         notaryUrl,
         websocketProxyUrl,
@@ -121,7 +114,7 @@ export default function Notarize(): ReactElement {
   );
 }
 
-export function RevealHeaderStep(props: {
+function RevealHeaderStep(props: {
   onNext: () => void;
   onCancel: () => void;
   setSecretHeaders: (secrets: string[]) => void;
@@ -130,14 +123,13 @@ export 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 || ''}` || '';
           }
@@ -159,21 +151,21 @@ export function RevealHeaderStep(props: {
     [revealed, req],
   );
 
-  if (!headers) return <></>;
+  if (!req) return <></>;
 
   return (
     <div className="flex flex-col flex-nowrap flex-shrink flex-grow h-0">
       <div className="border bg-primary/[0.9] text-white border-slate-300 py-1 px-2 font-semibold">
-        `Step 1 of 2: Select which request headers you want to reveal`
+        Step 1 of 2: Select which request headers you want to reveal
       </div>
       <div className="flex-grow flex-shrink h-0 overflow-y-auto">
         <table className="border border-slate-300 border-collapse table-fixed">
           <tbody className="bg-slate-200">
-            {headers.map((h) => (
+            {req.requestHeaders?.map((h) => (
               <tr
                 key={h.name}
                 className={classNames('border-b border-slate-200 text-xs', {
-                  'bg-slate-50': revealed[h.name],
+                  'bg-slate-50': !!revealed[h.name],
                 })}
               >
                 <td className="border border-slate-300 py-1 px-2 align-top">
@@ -181,14 +173,14 @@ export function RevealHeaderStep(props: {
                     type="checkbox"
                     className="cursor-pointer"
                     onChange={(e) => changeHeaderKey(h.name, e.target.checked)}
-                    checked={revealed[h.name]}
+                    checked={!!revealed[h.name]}
                   />
                 </td>
                 <td className="border border-slate-300 font-bold align-top py-1 px-2 whitespace-nowrap">
                   {h.name}
                 </td>
                 <td className="border border-slate-300 break-all align-top py-1 px-2">
-                  {revealed[h.name]
+                  {!!revealed[h.name]
                     ? h.value
                     : Array(h.value?.length || 0)
                         .fill('*')
@@ -214,73 +206,6 @@ export function RevealHeaderStep(props: {
   );
 }
 
-export function RevealHeaderTable(props: {
-  headers: { name: string; value: string }[];
-  className?: string;
-  onChange: (revealed: { [key: string]: boolean }) => void;
-}) {
-  const { headers } = props;
-  const [revealed, setRevealed] = useState<{ [key: string]: boolean }>({});
-
-  const changeHeaderKey = useCallback(
-    (key: string, shouldReveal: boolean) => {
-      const result = {
-        ...revealed,
-        [key]: shouldReveal,
-      };
-      setRevealed(result);
-      props.onChange(result);
-    },
-    [revealed],
-  );
-
-  return (
-    <table
-      className={classNames(
-        'border border-slate-300 border-collapse table-fixed',
-        props.className,
-      )}
-    >
-      <thead className="bg-slate-200">
-        <th className="border border-slate-300 py-1 px-2 align-middle w-8"></th>
-        <th className="border border-slate-300 py-1 px-2 align-middle">Name</th>
-        <th className="border border-slate-300 py-1 px-2 align-middle">
-          Value
-        </th>
-      </thead>
-      <tbody className="bg-slate-100">
-        {headers.map((h) => (
-          <tr
-            key={h.name}
-            className={classNames('border-b border-slate-200 text-xs', {
-              'bg-slate-50': revealed[h.name],
-            })}
-          >
-            <td className="border border-slate-300 py-1 px-2 align-top w-8">
-              <input
-                type="checkbox"
-                className="cursor-pointer"
-                onChange={(e) => changeHeaderKey(h.name, e.target.checked)}
-                checked={revealed[h.name]}
-              />
-            </td>
-            <td className="border border-slate-300 font-bold align-top py-1 px-2 whitespace-nowrap">
-              {h.name}
-            </td>
-            <td className="border border-slate-300 break-all align-top py-1 px-2">
-              {revealed[h.name]
-                ? h.value
-                : Array(h.value?.length || 0)
-                    .fill('*')
-                    .join('')}
-            </td>
-          </tr>
-        ))}
-      </tbody>
-    </table>
-  );
-}
-
 function HideResponseStep(props: {
   onNext: () => void;
   onCancel: () => void;
@@ -363,7 +288,6 @@ function HideResponseStep(props: {
           .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">
@@ -392,112 +316,6 @@ 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

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

src/pages/Options/index.tsx

@@ -1,169 +1,76 @@
-import React, {
-  ReactElement,
-  useState,
-  useEffect,
-  useCallback,
-  MouseEvent,
-} from 'react';
+import React, { ReactElement, useState, useEffect, useCallback } 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(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 [notary, setNotary] = useState('https://notary.pse.dev');
+  const [proxy, setProxy] = useState('wss://notary.pse.dev/proxy');
+  const [rendezvous, setRendezvous] = useState(
+    'wss://notary.pse.dev/rendezvous',
+  );
   const [dirty, setDirty] = useState(false);
-  const [shouldReload, setShouldReload] = useState(false);
-  const [advanced, setAdvanced] = useState(false);
-  const [showReloadModal, setShowReloadModal] = useState(false);
 
   useEffect(() => {
     (async () => {
-      setNotary(await getNotaryApi());
-      setProxy(await getProxyApi());
+      setNotary(await get(NOTARY_API_LS_KEY));
+      setProxy(await get(PROXY_API_LS_KEY));
     })();
   }, []);
 
-  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 onSave = useCallback(async () => {
+    await set(NOTARY_API_LS_KEY, notary);
+    await set(PROXY_API_LS_KEY, proxy);
+    setDirty(false);
+  }, [notary, proxy]);
 
   return (
-    <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 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>
-      <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 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}
         />
-      )}
+      </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-col flex-nowrap py-1 px-2 gap-2">
+        <div className="font-semibold">Rendezvous API</div>
+        <input
+          type="text"
+          className="input border"
+          placeholder="wss://notary.pse.dev/rendezvous"
+          onChange={(e) => {
+            setRendezvous(e.target.value);
+            setDirty(true);
+          }}
+          value={rendezvous}
+        />
+      </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"
@@ -176,150 +83,3 @@ export default function Options(): ReactElement {
     </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/P2P/index.tsx

@@ -0,0 +1,30 @@
+import React, { ReactElement, useEffect } from 'react';
+import { useNavigate } from 'react-router';
+import { useDispatch } from 'react-redux';
+import { connectSession } from '../../reducers/p2p';
+
+export default function P2P(): ReactElement {
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(connectSession());
+  }, []);
+
+  return (
+    <div className="flex flex-col flex-nowrap flex-grow gap-2 m-4">
+      <button
+        className="button button--primary mx-20 brea"
+        onClick={() => navigate('/create-session')}
+      >
+        Create Session
+      </button>
+      <button
+        className="button button--primary mx-20"
+        onClick={() => navigate('/connect-session')}
+      >
+        Connect to Session
+      </button>
+    </div>
+  );
+}

src/pages/PeerToPeer/index.tsx

@@ -1,354 +0,0 @@
-import React, {
-  ChangeEvent,
-  ReactElement,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
-import Icon from '../../components/Icon';
-import classNames from 'classnames';
-import {
-  connectRendezvous,
-  disconnectRendezvous,
-  fetchP2PState,
-  sendPairRequest,
-  useClientId,
-  useIncomingPairingRequests,
-  useOutgoingPairingRequests,
-  cancelPairRequest,
-  useP2PError,
-  setP2PError,
-  acceptPairRequest,
-  rejectPairRequest,
-  usePairId,
-  useIncomingProofRequests,
-  requestProofByHash,
-  useOutgoingProofRequests,
-  acceptProofRequest,
-  rejectProofRequest,
-  cancelProofRequest,
-} 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';
-
-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);
-
-  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]);
-
-  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>
-      {incomingPluginHash ? (
-        <>
-          <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}
-            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>
-        </>
-      ) : outgoingPluginHash ? (
-        <>
-          <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>
-        </>
-      ) : (
-        <button
-          className="button button--primary"
-          onClick={() => showModal(true)}
-        >
-          Request Proof
-        </button>
-      )}
-    </div>
-  );
-}
-
-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/ProofUploader/index.tsx

@@ -13,7 +13,6 @@ export default function ProofUploader(): ReactElement {
     recv: string;
     sent: string;
   } | null>(null);
-  const [uploading, setUploading] = useState(false);
 
   const onFileUpload: ChangeEventHandler<HTMLInputElement> = useCallback(
     async (e) => {
@@ -26,21 +25,16 @@ 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,
-              })
-              .catch(() => null);
-
-            if (proof) {
-              setUploading(false);
-              setProof(res);
-            }
+            const res = await chrome.runtime.sendMessage<
+              any,
+              { recv: string; sent: string }
+            >({
+              type: BackgroundActiontype.verify_proof,
+              data: proof,
+            });
+            setProof(res);
           }
         });
-
-        setUploading(true);
         reader.readAsText(file);
       }
     },
@@ -59,23 +53,16 @@ export default function ProofUploader(): ReactElement {
           className="absolute w-full h-full top-0 left-0 opacity-0 z-10"
           onChange={onFileUpload}
           accept=".json"
-          disabled={uploading}
         />
-        {uploading ? (
-          <Icon className="animate-spin" fa="fa-solid fa-spinner" size={2} />
-        ) : (
-          <>
-            <Icon className="mb-4" fa="fa-solid fa-upload" size={2} />
-            <div className="text-lg">Drop your proof here to continue</div>
-            <div className="text-sm">or</div>
-            <button
-              className="button !bg-primary/[.8] !hover:bg-primary/[.7] !active:bg-primary !text-white cursor-pointer"
-              onClick={() => null}
-            >
-              Browse Files
-            </button>
-          </>
-        )}
+        <Icon className="mb-4" fa="fa-solid fa-upload" size={2} />
+        <div className="text-lg">Drop your proof here to continue</div>
+        <div className="text-sm">or</div>
+        <button
+          className="button !bg-primary/[.8] !hover:bg-primary/[.7] !active:bg-primary !text-white cursor-pointer"
+          onClick={() => null}
+        >
+          Browse Files
+        </button>
       </div>
     </div>
   );

src/pages/ProofViewer/index.tsx

@@ -57,14 +57,12 @@ 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>
         )}
       </div>

src/pages/RequestBuilder/index.tsx

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

src/pages/RunPluginApproval/index.tsx

@@ -1,119 +0,0 @@
-import React, { ReactElement, useCallback, useEffect, useState } from 'react';
-import Icon from '../../components/Icon';
-import { useSearchParams } from 'react-router-dom';
-import { type PluginConfig, PluginMetadata, urlify } from '../../utils/misc';
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../../entries/Background/rpc';
-import { BaseApproval } from '../BaseApproval';
-import { PluginPermissions } from '../../components/PluginInfo';
-import {
-  getPluginConfigByHash,
-  getPluginMetadataByHash,
-} from '../../entries/Background/db';
-import { runPlugin } from '../../utils/rpc';
-
-export function RunPluginApproval(): ReactElement {
-  const [params] = useSearchParams();
-  const origin = params.get('origin');
-  const favIconUrl = params.get('favIconUrl');
-  const hash = params.get('hash');
-  const hostname = urlify(origin || '')?.hostname;
-  const [error, showError] = useState('');
-  const [metadata, setPluginMetadata] = useState<PluginMetadata | null>(null);
-  const [pluginContent, setPluginContent] = useState<PluginConfig | null>(null);
-
-  const onCancel = useCallback(() => {
-    browser.runtime.sendMessage({
-      type: BackgroundActiontype.run_plugin_response,
-      data: false,
-    });
-  }, []);
-
-  const onAccept = useCallback(async () => {
-    if (!hash) return;
-    try {
-      const tab = await browser.tabs.create({
-        active: true,
-      });
-
-      await browser.storage.local.set({ plugin_hash: hash });
-
-      // @ts-ignore
-      if (chrome.sidePanel) await chrome.sidePanel.open({ tabId: tab.id });
-
-      browser.runtime.sendMessage({
-        type: BackgroundActiontype.run_plugin_response,
-        data: true,
-      });
-    } catch (e: any) {
-      showError(e.message);
-    }
-  }, [hash]);
-
-  useEffect(() => {
-    (async () => {
-      if (!hash) return;
-      try {
-        const config = await getPluginConfigByHash(hash);
-        const metadata = await getPluginMetadataByHash(hash);
-        setPluginContent(config);
-        setPluginMetadata(metadata);
-      } catch (e: any) {
-        showError(e?.message || 'Invalid Plugin');
-      }
-    })();
-  }, [hash]);
-
-  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

@@ -94,12 +94,6 @@ export const useHistoryOrder = (): string[] => {
   }, deepEqual);
 };
 
-export const useAllProofHistory = (): RequestHistory[] => {
-  return useSelector((state: AppRootState) => {
-    return state.history.order.map((id) => state.history.map[id]);
-  }, deepEqual);
-};
-
 export const useRequestHistory = (id?: string): RequestHistory | undefined => {
   return useSelector((state: AppRootState) => {
     if (!id) return undefined;

src/reducers/index.tsx

@@ -1,13 +1,11 @@
 import { combineReducers } from 'redux';
 import requests from './requests';
 import history from './history';
-import plugins from './plugins';
 import p2p from './p2p';
 
 const rootReducer = combineReducers({
   requests,
   history,
-  plugins,
   p2p,
 });
 

src/reducers/p2p.ts

@@ -1,321 +0,0 @@
-import { useSelector } from 'react-redux';
-import { AppRootState } from './index';
-import deepEqual from 'fast-deep-equal';
-import { Dispatch } from 'redux';
-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',
-}
-
-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[];
-};
-
-export type RequestProofMessage = {
-  to: string;
-  from: string;
-  id: number;
-  text?: undefined;
-};
-
-const initialState: State = {
-  clientId: '',
-  pairing: '',
-  error: '',
-  connected: false,
-  incomingPairingRequests: [],
-  outgoingPairingRequests: [],
-  incomingProofRequests: [],
-  outgoingProofRequests: [],
-};
-
-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 requestProof = (pluginHash: string) => {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.request_p2p_proof,
-    data: pluginHash,
-  });
-};
-
-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,
-      };
-    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);
-}

src/reducers/p2p.tsx

@@ -0,0 +1,264 @@
+import { useSelector } from 'react-redux';
+import { AppRootState } from './index';
+import deepEqual from 'fast-deep-equal';
+import { safeParseJSON } from '../utils/misc';
+import { Dispatch } from 'redux';
+
+enum ActionType {
+  '/p2p/createSession' = '/p2p/createSession',
+  '/p2p/setConnected' = '/p2p/setConnected',
+  '/p2p/setClientId' = '/p2p/setClientId',
+  '/p2p/setSocket' = '/p2p/setSocket',
+  '/p2p/appendMessage' = '/p2p/appendMessage',
+  '/p2p/setMessages' = '/p2p/setMessages',
+  '/p2p/setPairing' = '/p2p/setPairing',
+}
+
+type Action<payload> = {
+  type: ActionType;
+  payload?: payload;
+  error?: boolean;
+  meta?: any;
+};
+
+type State = {
+  clientId: string;
+  pairing: string;
+  socket: WebSocket | null;
+  connected: boolean;
+  messages: Chat[];
+};
+
+type Chat = {
+  to: string;
+  from: string;
+  text: string;
+};
+
+const initialState: State = {
+  clientId: '',
+  pairing: '',
+  socket: null,
+  connected: false,
+  messages: [],
+};
+
+export const connectSession =
+  () => async (dispatch: Dispatch, getState: () => AppRootState) => {
+    const { p2p } = getState();
+
+    if (p2p.socket) return;
+
+    const socket = new WebSocket('ws://0.tcp.ngrok.io:14339?clientId=hi');
+
+    socket.onopen = () => {
+      console.log('Connected to websocket');
+      dispatch(setConnected(true));
+      dispatch(setSocket(socket));
+    };
+
+    socket.onmessage = async (event) => {
+      const message: any = safeParseJSON(await event.data.text());
+
+      console.log(message);
+      switch (message.method) {
+        case 'client_connect': {
+          const { clientId } = message.params;
+          dispatch(setClientId(clientId));
+          break;
+        }
+        case 'chat': {
+          const { to, from, text } = message.params;
+          dispatch(
+            appendMessage({
+              to,
+              from,
+              text,
+            }),
+          );
+          break;
+        }
+        case 'pair_request': {
+          const { from } = message.params;
+          dispatch(confirmPairRequest(from));
+          break;
+        }
+        case 'pair_request_success': {
+          const { from } = message.params;
+          dispatch(setPairing(from));
+          break;
+        }
+        default:
+          console.warn(`Unknown message type "${message.method}"`);
+          break;
+      }
+    };
+    socket.onerror = () => {
+      console.error('Error connecting to websocket');
+      dispatch(setConnected(false));
+    };
+  };
+
+export const setConnected = (connected = false) => ({
+  type: ActionType['/p2p/setConnected'],
+  payload: connected,
+});
+
+export const setClientId = (clientId: string) => ({
+  type: ActionType['/p2p/setClientId'],
+  payload: clientId,
+});
+
+export const setSocket = (socket: WebSocket) => ({
+  type: ActionType['/p2p/setSocket'],
+  payload: socket,
+});
+
+export const setMessages = (messages: Chat[]) => ({
+  type: ActionType['/p2p/setMessages'],
+  payload: messages,
+});
+
+export const appendMessage = (message: Chat) => ({
+  type: ActionType['/p2p/appendMessage'],
+  payload: message,
+});
+
+export const setPairing = (clientId: string) => ({
+  type: ActionType['/p2p/setPairing'],
+  payload: clientId,
+});
+
+let id = 1;
+export const sendChat =
+  (message: Chat) =>
+  async (dispatch: Dispatch, getState: () => AppRootState) => {
+    const {
+      p2p: { socket },
+    } = getState();
+    if (socket) {
+      socket.send(
+        Buffer.from(
+          JSON.stringify({
+            method: 'chat',
+            params: {
+              ...message,
+              id: id++,
+            },
+          }),
+        ),
+      );
+      dispatch(appendMessage(message));
+    }
+  };
+export const sendPairRequest =
+  (target: string) =>
+  async (dispatch: Dispatch, getState: () => AppRootState) => {
+    const {
+      p2p: { socket, clientId },
+    } = getState();
+    if (socket && clientId) {
+      socket.send(
+        Buffer.from(
+          JSON.stringify({
+            method: 'pair_request',
+            params: {
+              from: clientId,
+              to: target,
+              id: id++,
+            },
+          }),
+        ),
+      );
+    }
+  };
+export const confirmPairRequest =
+  (target: string) => (dispatch: Dispatch, getState: () => AppRootState) => {
+    const {
+      p2p: { socket, clientId },
+    } = getState();
+
+    console.log({ target, clientId });
+    if (socket && clientId) {
+      socket.send(
+        Buffer.from(
+          JSON.stringify({
+            method: 'pair_request_success',
+            params: {
+              from: clientId,
+              to: target,
+              id: id++,
+            },
+          }),
+        ),
+      );
+      dispatch(setPairing(target));
+    }
+  };
+
+export default function p2p(state = initialState, action: Action<any>) {
+  switch (action.type) {
+    case ActionType['/p2p/setConnected']:
+      return {
+        ...state,
+        connected: action.payload,
+      };
+    case ActionType['/p2p/setClientId']:
+      return {
+        ...state,
+        clientId: action.payload,
+      };
+    case ActionType['/p2p/setSocket']:
+      return {
+        ...state,
+        socket: action.payload,
+      };
+    case ActionType['/p2p/setMessages']:
+      return {
+        ...state,
+        messages: action.payload,
+      };
+    case ActionType['/p2p/setPairing']:
+      return {
+        ...state,
+        pairing: action.payload,
+      };
+    case ActionType['/p2p/appendMessage']:
+      return {
+        ...state,
+        messages: state.messages.concat(action.payload),
+      };
+    default:
+      return state;
+  }
+}
+
+export function useClientId() {
+  return useSelector((state: AppRootState) => {
+    return state.p2p.clientId;
+  }, deepEqual);
+}
+
+export function useSocket() {
+  return useSelector((state: AppRootState) => {
+    return state.p2p.socket;
+  }, deepEqual);
+}
+
+export function useConnected() {
+  return useSelector((state: AppRootState) => {
+    return state.p2p.connected;
+  }, deepEqual);
+}
+
+export function useChatMessages(): Chat[] {
+  return useSelector((state: AppRootState) => {
+    return state.p2p.messages;
+  }, deepEqual);
+}
+
+export function usePairId(): string {
+  return useSelector((state: AppRootState) => {
+    return state.p2p.pairing;
+  }, deepEqual);
+}

src/reducers/plugins.tsx

@@ -1,54 +0,0 @@
-import { useSelector } from 'react-redux';
-import { AppRootState } from './index';
-import deepEqual from 'fast-deep-equal';
-
-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);
-};

src/reducers/requests.ts

@@ -5,12 +5,7 @@ import {
 import { useSelector } from 'react-redux';
 import { AppRootState } from './index';
 import deepEqual from 'fast-deep-equal';
-import {
-  getNotaryApi,
-  getProxyApi,
-  getMaxSent,
-  getMaxRecv,
-} from '../utils/storage';
+import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../utils/storage';
 import { BackgroundActiontype } from '../entries/Background/rpc';
 import browser from 'webextension-polyfill';
 
@@ -18,7 +13,6 @@ enum ActionType {
   '/requests/setRequests' = '/requests/setRequests',
   '/requests/addRequest' = '/requests/addRequest',
   '/requests/setActiveTab' = '/requests/setActiveTab',
-  '/requests/isConnected' = '/requests/isConnected',
 }
 
 type Action<payload> = {
@@ -33,22 +27,11 @@ type State = {
     [requestId: string]: RequestLog;
   };
   activeTab: chrome.tabs.Tab | null;
-  isConnected: boolean;
 };
 
 const initialState: State = {
   map: {},
   activeTab: null,
-  isConnected: false,
-};
-
-export const setConnection = (isConnected: boolean): Action<boolean> => ({
-  type: ActionType['/requests/isConnected'],
-  payload: isConnected,
-});
-
-export const isConnected = (isConnected: boolean) => async () => {
-  return isConnected;
 };
 
 export const setRequests = (requests: RequestLog[]): Action<RequestLog[]> => ({
@@ -57,10 +40,11 @@ export const setRequests = (requests: RequestLog[]): Action<RequestLog[]> => ({
 });
 
 export const notarizeRequest = (options: RequestHistory) => async () => {
-  const notaryUrl = await getNotaryApi();
-  const websocketProxyUrl = await getProxyApi();
-  const maxSentData = await getMaxSent();
-  const maxRecvData = await getMaxRecv();
+  const notaryUrl = await get(NOTARY_API_LS_KEY, 'https://notary.pse.dev');
+  const websocketProxyUrl = await get(
+    PROXY_API_LS_KEY,
+    'wss://notary.pse.dev/proxy',
+  );
 
   chrome.runtime.sendMessage<any, string>({
     type: BackgroundActiontype.prove_request_start,
@@ -70,8 +54,6 @@ export const notarizeRequest = (options: RequestHistory) => async () => {
       headers: options.headers,
       body: options.body,
       maxTranscriptSize: options.maxTranscriptSize,
-      maxSentData,
-      maxRecvData,
       secretHeaders: options.secretHeaders,
       secretResps: options.secretResps,
       notaryUrl,
@@ -125,11 +107,6 @@ export default function requests(
           [action.payload.requestId]: action.payload,
         },
       };
-    case ActionType['/requests/isConnected']:
-      return {
-        ...state,
-        isConnected: action.payload,
-      };
     default:
       return state;
   }
@@ -159,7 +136,3 @@ export const useActiveTabUrl = (): URL | null => {
     return activeTab?.url ? new URL(activeTab.url) : null;
   }, deepEqual);
 };
-
-export const useIsConnected = (): boolean => {
-  return useSelector((state: AppRootState) => state.requests.isConnected);
-};

src/utils/constants.ts

@@ -1,6 +1 @@
-export const EXPLORER_API = 'https://explorer.tlsnotary.org';
-export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.5';
-export const RENDEZVOUS_API = 'wss://explorer.tlsnotary.org:3000';
-export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy';
-export const MAX_RECV = 16384;
-export const MAX_SENT = 4096;
+export const EXPLORER_API = 'http://localhost:3000';

src/utils/misc.ts

@@ -1,22 +1,5 @@
-import {
-  BackgroundActiontype,
-  handleExecP2PPluginProver,
-  handleExecPluginProver,
-  RequestLog,
-} from '../entries/Background/rpc';
+import { 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 } from '../entries/Background/db';
-
-const charwise = require('charwise');
 
 export function urlify(
   text: string,
@@ -61,6 +44,7 @@ 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' }),
@@ -111,14 +95,8 @@ 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();
@@ -129,284 +107,11 @@ export const extractBodyFromResponse = async (
   } 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 {
-          url,
-          method,
-          headers,
-          getSecretResponse,
-          body: reqBody,
-        } = params;
-        let secretResps;
-        const resp = await fetch(url, {
-          method,
-          headers,
-          body: reqBody,
-        });
-        const body = await extractBodyFromResponse(resp);
-
-        if (getSecretResponse) {
-          const out = await plugin.call(getSecretResponse, body);
-          secretResps = JSON.parse(out.string());
-        }
-
-        if (meta?.p2p) {
-          handleExecP2PPluginProver({
-            type: BackgroundActiontype.execute_p2p_plugin_prover,
-            data: {
-              ...params,
-              pluginHash: await sha256(
-                Buffer.from(arrayBuffer).toString('hex'),
-              ),
-              body: reqBody,
-              secretResps,
-              now,
-              clientId: meta.clientId,
-            },
-          });
-        } else {
-          handleExecPluginProver({
-            type: BackgroundActiontype.execute_plugin_prover,
-            data: {
-              ...params,
-              body: reqBody,
-              secretResps,
-              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?.cookies) {
-    const cookies: { [hostname: string]: { [key: string]: string } } = {};
-    for (const host of config.cookies) {
-      const cache = await getCookiesByHost(host);
-      cookies[host] = cache;
-    }
-    // @ts-ignore
-    injectedConfig.cookies = JSON.stringify(cookies);
-  }
-
-  if (config?.headers) {
-    const headers: { [hostname: string]: { [key: string]: string } } = {};
-    for (const host of config.headers) {
-      const cache = await getHeadersByHost(host);
-      headers[host] = 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;
-  description?: string;
-  cta: string;
-  action: string;
-  prover?: boolean;
-};
-
-export type PluginConfig = {
-  title: string;
-  description: string;
-  icon?: string;
-  steps?: StepConfig[];
-  hostFunctions?: string[];
-  cookies?: string[];
-  headers?: string[];
-  requests: { method: string; url: string }[];
-  notaryUrls?: string[];
-  proxyUrls?: string[];
-};
-
-export type PluginMetadata = {
-  origin: string;
-  filePath: string;
-} & { [k: string]: string };
-
-export const getPluginConfig = async (
-  data: Plugin | ArrayBuffer,
-): Promise<PluginConfig> => {
-  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.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) {
+export function safeParseJSON(data: string) {
   try {
-    return JSON.parse(data!);
+    return JSON.parse(data);
   } catch (e) {
     return null;
   }

src/utils/plugins.tsx

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

src/utils/promise.ts

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

src/utils/rpc.ts

@@ -1,56 +0,0 @@
-import browser from 'webextension-polyfill';
-import { BackgroundActiontype } from '../entries/Background/rpc';
-import { PluginConfig } from './misc';
-
-export async function addPlugin(hex: string) {
-  return browser.runtime.sendMessage({
-    type: BackgroundActiontype.add_plugin,
-    data: hex,
-  });
-}
-
-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,12 +1,6 @@
-import { LoggingLevel } from 'tlsn-js';
-import { RENDEZVOUS_API } from './constants';
-
 export const NOTARY_API_LS_KEY = 'notary-api';
 export const PROXY_API_LS_KEY = 'proxy-api';
-export const MAX_SENT_LS_KEY = 'max-sent';
-export const MAX_RECEIVED_LS_KEY = 'max-received';
-export const LOGGING_FILTER_KEY = 'logging-filter-2';
-export const RENDEZVOUS_API_LS_KEY = 'rendezvous-api';
+export const HISTORY_LS_KEY = 'history';
 
 export async function set(key: string, value: string) {
   return chrome.storage.sync.set({ [key]: value });
@@ -16,29 +10,5 @@ export async function get(key: string, defaultValue?: string) {
   return chrome.storage.sync
     .get(key)
     .then((json: any) => json[key] || defaultValue)
-    .catch(() => defaultValue);
-}
-
-export async function getMaxSent() {
-  return parseInt(await get(MAX_SENT_LS_KEY, '4096'));
-}
-
-export async function getMaxRecv() {
-  return parseInt(await get(MAX_RECEIVED_LS_KEY, '16384'));
-}
-
-export async function getNotaryApi() {
-  return await get(NOTARY_API_LS_KEY, 'https://notary.pse.dev/v0.1.0-alpha.6');
-}
-
-export async function getProxyApi() {
-  return await get(PROXY_API_LS_KEY, 'wss://notary.pse.dev/proxy');
-}
-
-export async function getLoggingFilter(): Promise<LoggingLevel> {
-  return await get(LOGGING_FILTER_KEY, 'Info');
-}
-
-export async function getRendezvousApi(): Promise<string> {
-  return await get(RENDEZVOUS_API_LS_KEY, RENDEZVOUS_API);
+    .catch(() => '');
 }

src/utils/store.ts

@@ -1,4 +1,3 @@
-import type {} from 'redux-thunk/extend-redux';
 import { applyMiddleware, createStore } from 'redux';
 import thunk from 'redux-thunk';
 import { createLogger } from 'redux-logger';

src/utils/types.ts

@@ -1,18 +0,0 @@
-export type Proof = ProofV0 | ProofV1;
-
-export type ProofV0 = {
-  version?: undefined;
-  session: any;
-  substrings: any;
-  notaryUrl: string;
-};
-
-export type ProofV1 = {
-  version: '1.0';
-  data: string;
-  meta: {
-    notaryUrl: string;
-    websocketProxyUrl: string;
-    pluginUrl?: string;
-  };
-};

tsconfig.json

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

utils/bookmark/bookmarks.json

@@ -0,0 +1,22 @@
+[
+  {
+    "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

@@ -0,0 +1,34 @@
+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;
+    }
+  });
+}

utils/env.js

@@ -1,5 +1,5 @@
 // tiny wrapper with default env vars
 module.exports = {
   NODE_ENV: process.env.NODE_ENV || 'development',
-  PORT: process.env.PORT || 3000,
+  PORT: process.env.PORT || 3001,
 };

webpack.config.js

@@ -40,8 +40,7 @@ var options = {
   mode: process.env.NODE_ENV || "development",
   ignoreWarnings: [
     /Circular dependency between chunks with runtime/,
-    /ResizeObserver loop completed with undelivered notifications/,
-    /Should not import the named export/,
+    /ResizeObserver loop completed with undelivered notifications/
   ],
 
   entry: {
@@ -49,9 +48,7 @@ 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"],
@@ -149,9 +146,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: [
         {
@@ -200,21 +197,31 @@ var options = {
     }),
     new CopyWebpackPlugin({
       patterns: [
+        // {
+        //   from: "node_modules/tlsn-js/build/7.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
+        // {
+        //   from: "node_modules/tlsn-js/build/250.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
+        // {
+        //   from: "node_modules/tlsn-js/build/278.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
+        // {
+        //   from: "node_modules/tlsn-js/build/349.js",
+        //   to: path.join(__dirname, "build"),
+        //   force: true,
+        // },
         {
           from: "node_modules/tlsn-js/build",
           to: path.join(__dirname, "build"),
           force: true,
         },
-        {
-          from: "src/assets/plugins/discord_dm.wasm",
-          to: path.join(__dirname, "build"),
-          force: true,
-        },
-        {
-          from: "src/assets/plugins/twitter_profile.wasm",
-          to: path.join(__dirname, "build"),
-          force: true,
-        },
       ],
     }),
     new HtmlWebpackPlugin({
@@ -235,12 +242,6 @@ 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'],
     }),