fix(ceremony): save progress

ceremony/src/lib/client/index.ts

@@ -1,10 +1,9 @@
-import { get, post } from "$lib/client/http.ts"
-import type { ContributeBody, ClientStatus } from "$lib/client/types.ts"
-import { user } from "$lib/stores/user.svelte.ts"
-import { getQueuePayloadId } from "$lib/supabase/queries.ts"
-import type {ClientState} from "$lib/stores/state.svelte.ts";
+import {get, post} from "$lib/client/http.ts"
+import type {ClientState, ContributeBody} from "$lib/client/types.ts"
+import {user} from "$lib/stores/user.svelte.ts"
+import {getQueuePayloadId} from "$lib/supabase/queries.ts"
 
-export const start = async (): Promise<ClientStatus | undefined> => {
+export const start = async (): Promise<ClientState | undefined> => {
   const userId = user?.session?.user.id
   const email = user?.session?.user?.email
 
@@ -32,34 +31,19 @@ export const start = async (): Promise<ClientStatus | undefined> => {
     supabaseProject: import.meta.env.VITE_SUPABASE_URL,
     apiKey: import.meta.env.VITE_SUPABASE_ANON_KEY,
     bucket: import.meta.env.VITE_BUCKET_ID,
-    userEmail: email
   }
 
-  return post<ClientStatus>("contribute", {}, contributeBody)
+  return post<ClientState>("contribute", {}, contributeBody)
 }
 
 
 export const checkState = async (): Promise<ClientState> => {
   try {
-    const response = await get<any>("contribute", {});
-    console.log(response);
-
-    if (typeof response === 'string') {
-      return response;
-    }
-
-    if (response && typeof response.status === 'string') {
-      return response.status;
-    }
-
-    if (Array.isArray(response) && typeof response[0] === 'string') {
-      return response[0];
-    }
-
-    throw new Error("Invalid response format. Status is undefined.");
+    return await get<ClientState>("contribute", {});
   } catch (error) {
     console.log('Error fetching status:', error);
     return 'offline';
   }
 };
 
+

ceremony/src/lib/client/types.ts

@@ -1,15 +1,17 @@
-export interface ClientStatus {
-  status: "idle" | "initializing" | "contributionStarted" | "contributionEnded" | "successful" | "offline"
-  downloadStarted?: string
-  downloading?: {
-    file: string
-    progress: number
-  }
-  downloadEnded?: string
-  uploadStarted?: string
-  uploadEnded?: string
-  failed?: string
-}
+export type ClientState =
+  | "idle"
+  | "initializing"
+  | "downloadStarted"
+  | "downloading"
+  | "downloadEnded"
+  | "contributionStarted"
+  | "contributionEnded"
+  | "uploadStarted"
+  | "uploadEnded"
+  | "failed"
+  | "successful"
+  | "offline"
+  | undefined
 
 export interface ContributeBody {
   supabaseProject: string

ceremony/src/lib/stores/state.svelte.ts

@@ -1,6 +1,7 @@
 import {onDestroy} from "svelte";
 import {checkState} from "$lib/client";
 import {checkContributionState, getUserQueueInfo} from "$lib/supabase";
+import type {ClientState} from "$lib/client/types.ts";
 
 type IntervalID = NodeJS.Timeout | number;
 
@@ -21,13 +22,6 @@ export type ContributionState =
   | 'verifying'
   | 'notContributed'
 
-export type ClientState =
-  "idle"
-  | "initializing"
-  | "contributionStarted"
-  | "contributionEnded"
-  | "successful"
-  | "offline"
 
 interface UserContext {
   position: number | null;
@@ -226,8 +220,8 @@ export class ContributorState {
     } else if (this.contributionState === 'contribute') {
       if (this.clientState === 'idle') {
         this.state = 'contribute';
-      } else {
-        this.state = 'noClient'
+      } else if (this.clientState === 'contributionStarted') {
+        this.state = 'contributing'
       }
     } else if (this.queueState.position !== null) {
       this.state = 'inQueue';

ceremony/src/routes/+layout.svelte

@@ -69,6 +69,12 @@
     }
   })
 
+  window.addEventListener("beforeunload", (e: BeforeUnloadEvent) => {
+    e.preventDefault()
+    e.returnValue = ""
+  })
+
+
 
 </script>
 

ceremony/src/routes/+page.svelte

@@ -8,6 +8,7 @@
   let contributor: ContributorState = new ContributorState()
 
   $effect(() => {
+    console.log(contributor.state)
     const userId = user.session?.user.id
     if (userId) contributor.setUserId(userId)
   })