feat: alpha.9 (#44)

Author: 0xtsukino

package-lock.json

@@ -58,7 +58,7 @@
     "redux-thunk": "^2.4.2",
     "stream": "^0.0.2",
     "tailwindcss": "^3.3.3",
-    "tlsn-js": "0.1.0-alpha.7.1",
+    "tlsn-js": "0.1.0-alpha.9",
     "tlsn-js-v5": "npm:[email protected]",
     "ws": "^8.16.0"
   },

package.json

@@ -14,12 +14,12 @@ import { verify } from '../rs/verifier/index.node';
 // @ts-ignore
 import { verify as verifyV7 } from '../rs/0.1.0-alpha.7/index.node';
 import { Attestation } from '../web/utils/types/types';
-import { convertNotaryWsToHttp } from '../web/utils';
 import { IncomingMessage } from 'node:http';
 import { createServer } from 'http';
 import { WebSocketServer, type RawData, type WebSocket } from 'ws';
 import crypto from 'crypto';
 import qs from 'qs';
+import { convertNotaryWsToHttp } from '../utils/url';
 
 const app = express();
 const port = process.env.PORT || 3000;
@@ -114,15 +114,15 @@ app.get('/ipfs/:cid', async (req, res) => {
         notaryUrl: jsonProof.notaryUrl,
         notaryKey: notaryPem,
       };
-    } else if (jsonProof.version === '0.1.0-alpha.7') {
+    } else if (jsonProof.version) {
       const notaryUrl = convertNotaryWsToHttp(jsonProof.meta.notaryUrl);
       const notaryPem = await fetchPublicKeyFromNotary(notaryUrl).catch(
         () => '',
       );
       const proof = await verifyV7(jsonProof.data, notaryPem);
       proof.notaryUrl = jsonProof.meta.notaryUrl;
       storeConfig.proofs.ipfs[req.params.cid].proof = {
-        version: '0.1.0-alpha.7',
+        version: jsonProof.version,
         time: proof.time,
         sent: proof.sent,
         recv: proof.recv,

server/index.tsx

@@ -0,0 +1,8 @@
+export function convertNotaryWsToHttp(notaryWs: string) {
+  const { protocol, pathname, hostname, port } = new URL(notaryWs);
+  const p = protocol === 'wss:' ? 'https:' : 'http:';
+  const pt = port ? `:${port}` : '';
+  const path = pathname === '/' ? '' : pathname.replace('/notarize', '');
+  const h = hostname === 'localhost' ? '127.0.0.1' : hostname;
+  return p + '//' + h + pt + path;
+}

utils/url.ts

@@ -7,7 +7,6 @@ import { FileDropdown } from '../FileDropdown';
 import { PubkeyInput } from '../../pages/PubkeyInput';
 import { AttestedData } from '../../utils/types/types';
 import { File } from '@web-std/file';
-import { verify } from '../../utils';
 
 export default function SharedProof(): ReactElement {
   const { cid } = useParams();
@@ -33,6 +32,8 @@ export default function SharedProof(): ReactElement {
   const onVerify = useCallback(
     async (key = '') => {
       if (!proofData?.raw) return;
+      const { verify } = await import('../../utils');
+
       const resp = await verify(proofData?.raw, key);
       setVerifiedProof(resp);
     },

web/components/SharedProof/index.tsx

@@ -1,6 +1,5 @@
 import React, { ReactElement, useCallback, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { readFileAsync, safeParseJSON, verify } from '../../utils';
 import FileUploadInput from '../../components/FileUploadInput';
 import ProofViewer from '../../components/ProofViewer';
 import {
@@ -24,6 +23,7 @@ export default function FileDrop(): ReactElement {
 
   const onVerify = useCallback(async (json: Attestation, key = '') => {
     try {
+      const { verify } = await import('../../utils');
       const resp = await verify(json, key);
       setVerifiedProof(resp);
       setStep('result');
@@ -54,6 +54,7 @@ export default function FileDrop(): ReactElement {
 
       setError('');
 
+      const { readFileAsync, safeParseJSON } = await import('../../utils');
       const proofContent = await readFileAsync(file);
       const json: Attestation = safeParseJSON(proofContent);
 

web/pages/FileDrop/index.tsx

@@ -4,7 +4,6 @@ import { useSelector } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 import { EXPLORER_URL } from '../utils/constants';
 import { Attestation, AttestedData } from '../utils/types/types';
-import { verify } from '../utils';
 
 enum ActionType {
   SetIPFSProof = 'proofs/setIPFSProof',
@@ -54,9 +53,12 @@ export const fetchProofFromIPFS =
       data = old.raw;
     }
 
-    const proof = await verify(data, notaryKey);
+    if (typeof window !== 'undefined') {
+      const { verify } = await import('../utils');
+      const proof = await verify(data, notaryKey);
 
-    dispatch(setIPFSProof({ cid, proof, raw: data }));
+      dispatch(setIPFSProof({ cid, proof, raw: data }));
+    }
   };
 
 export const setIPFSProof = (

web/store/proofs.ts

@@ -1,5 +1,10 @@
 import React, { ReactElement, useRef } from 'react';
 import { Attestation, AttestedData } from './types/types';
+import * as Comlink from 'comlink';
+import { convertNotaryWsToHttp } from '../../utils/url';
+const { init, Presentation }: any = Comlink.wrap(
+  new Worker(new URL('./worker.ts', import.meta.url)),
+);
 
 export const readFileAsync = (file: File): Promise<string> => {
   return new Promise((resolve, reject) => {
@@ -89,8 +94,6 @@ async function initTlsnJs() {
   if (tlsnInitPromise) return tlsnInitPromise;
   const { promise, resolve } = defer();
   tlsnInitPromise = promise;
-
-  const { default: init } = await import('tlsn-js');
   await init();
   resolve();
 }
@@ -117,9 +120,11 @@ export async function verify(
         notaryKey: key,
       };
     }
-    case '0.1.0-alpha.7': {
-      const { Presentation, Transcript } = await import('tlsn-js');
-      const tlsProof = new Presentation(attestation.data);
+    case '0.1.0-alpha.7':
+    case '0.1.0-alpha.8':
+    case '0.1.0-alpha.9':
+      const { Transcript } = await import('tlsn-js');
+      const tlsProof = await new Presentation(attestation.data);
       const data = await tlsProof.verify();
       const transcript = new Transcript({
         sent: data.transcript.sent,
@@ -133,7 +138,7 @@ export async function verify(
         .catch(() => '');
 
       return {
-        version: '0.1.0-alpha.7',
+        version: attestation.version,
         sent: transcript.sent(),
         recv: transcript.recv(),
         time: data.connection_info.time,
@@ -142,21 +147,11 @@ export async function verify(
         websocketProxyUrl: attestation.meta.websocketProxyUrl,
         verifierKey: verifyingKey,
       };
-    }
   }
 
   throw new Error('Invalid Proof');
 }
 
-export function convertNotaryWsToHttp(notaryWs: string) {
-  const { protocol, pathname, hostname, port } = new URL(notaryWs);
-  const p = protocol === 'wss:' ? 'https:' : 'http:';
-  const pt = port ? `:${port}` : '';
-  const path = pathname === '/' ? '' : pathname.replace('/notarize', '');
-  const h = hostname === 'localhost' ? '127.0.0.1' : hostname;
-  return p + '//' + h + pt + path;
-}
-
 function defer(): {
   promise: Promise<any>;
   resolve: (args?: any) => any;

web/utils/index.tsx

@@ -1,5 +1,9 @@
 export interface AttestedData {
-  version: '0.1.0-alpha.7' | '0.1.0-alpha.5';
+  version:
+    | '0.1.0-alpha.7'
+    | '0.1.0-alpha.8'
+    | '0.1.0-alpha.9'
+    | '0.1.0-alpha.5';
   time: number;
   sent: string;
   recv: string;
@@ -17,7 +21,7 @@ export type AttestationV0 = {
 };
 
 export type AttestationV1 = {
-  version: '0.1.0-alpha.7';
+  version: '0.1.0-alpha.7' | '0.1.0-alpha.8' | '0.1.0-alpha.9';
   data: string;
   meta: {
     notaryUrl: string;