feat: added Error for RequestProgress

tlsnotary · Feb 17, 2025 · c088d30 · c088d30
1 parent 1c9f340
commit c088d30
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 38 deletions.
diff --git a/src/entries/Background/rpc.ts b/src/entries/Background/rpc.ts
@@ -167,6 +167,7 @@ export enum RequestProgress {
   SendingRequest,
   ReadingTranscript,
   FinalizingOutputs,
+  Error,
 }
 
 export function progressText(progress: RequestProgress): string {
@@ -183,6 +184,8 @@ export function progressText(progress: RequestProgress): string {
       return 'Reading request transcript...';
     case RequestProgress.FinalizingOutputs:
       return 'Finalizing notarization outputs...';
+    case RequestProgress.Error:
+      return 'Notarization Failed';
   }
 }
 

diff --git a/src/entries/Offscreen/rpc.ts b/src/entries/Offscreen/rpc.ts
@@ -451,32 +451,35 @@ async function createProver(options: {
 
   const hostname = urlify(url)?.hostname || '';
   const notary = NotaryServer.from(notaryUrl);
+  try {
+    updateRequestProgress(id, RequestProgress.CreatingProver);
+    const prover: TProver = await new Prover({
+      id,
+      serverDns: hostname,
+      maxSentData,
+      maxRecvData,
+    });
 
-  updateRequestProgress(id, RequestProgress.CreatingProver);
-  const prover: TProver = await new Prover({
-    id,
-    serverDns: hostname,
-    maxSentData,
-    maxRecvData,
-  });
-
-  updateRequestProgress(id, RequestProgress.GettingSession);
-  const sessionUrl = await notary.sessionUrl(maxSentData, maxRecvData);
+    updateRequestProgress(id, RequestProgress.GettingSession);
+    const sessionUrl = await notary.sessionUrl(maxSentData, maxRecvData);
 
-  updateRequestProgress(id, RequestProgress.SettingUpProver);
-  await prover.setup(sessionUrl);
+    updateRequestProgress(id, RequestProgress.SettingUpProver);
+    await prover.setup(sessionUrl);
 
-  updateRequestProgress(id, RequestProgress.SendingRequest);
-  await prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
-    url,
-    method,
-    headers,
-    body,
-  });
+    updateRequestProgress(id, RequestProgress.SendingRequest);
+    await prover.sendRequest(websocketProxyUrl + `?token=${hostname}`, {
+      url,
+      method,
+      headers,
+      body,
+    });
 
-  return prover;
+    return prover;
+  } catch (error: any) {
+    updateRequestProgress(id, RequestProgress.Error);
+    throw error;
+  }
 }
-
 async function verifyProof(
   proof: PresentationJSON,
 ): Promise<{ sent: string; recv: string }> {

diff --git a/src/entries/SidePanel/SidePanel.tsx b/src/entries/SidePanel/SidePanel.tsx
@@ -318,12 +318,14 @@ function StepContent(
       <button className="button mt-2 w-fit flex flex-row flex-nowrap items-center gap-2 cursor-default">
         <Icon className="animate-spin" fa="fa-solid fa-spinner" size={1} />
         <span className="text-sm">
-          {notaryRequest?.progress
-            ? `(${(
-                ((notaryRequest.progress + 1) / 6.06) *
-                100
-              ).toFixed()}%) ${progressText(notaryRequest.progress)}`
-            : 'Pending...'}
+          {notaryRequest?.progress === 6
+            ? 'Error: Notarization Failed'
+            : notaryRequest?.progress
+              ? `(${(
+                  ((notaryRequest.progress + 1) / 6.06) *
+                  100
+                ).toFixed()}%) ${progressText(notaryRequest.progress)}`
+              : 'Pending...'}
         </span>
       </button>
     );

diff --git a/src/pages/History/index.tsx b/src/pages/History/index.tsx
@@ -1,11 +1,7 @@
 import React, { ReactElement, useState, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router';
-import {
-  useHistoryOrder,
-  useRequestHistory,
-  deleteRequestHistory,
-} from '../../reducers/history';
+import { useHistoryOrder, useRequestHistory } from '../../reducers/history';
 import Icon from '../../components/Icon';
 import NotarizeIcon from '../../assets/img/notarize.png';
 import { getNotaryApi, getProxyApi } from '../../utils/storage';
@@ -110,12 +106,14 @@ export function OneRequestHistory(props: {
                 size={1}
               />
               <span className="">
-                {request?.progress
-                  ? `(${(
-                      ((request.progress + 1) / 6.06) *
-                      100
-                    ).toFixed()}%) ${progressText(request.progress)}`
-                  : 'Pending...'}
+                {request?.progress === 6
+                  ? 'Error: Notarization Failed'
+                  : request?.progress
+                    ? `(${(
+                        ((request.progress + 1) / 6.06) *
+                        100
+                      ).toFixed()}%) ${progressText(request.progress)}`
+                    : 'Pending...'}
               </span>
             </div>
           )}