Revert changing addSubscription to an async function

spacedriveapp · Oct 9, 2024 · cc2edf5 · cc2edf5
1 parent 9acb6ea
commit cc2edf5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/client/src/v2/client.ts b/packages/client/src/v2/client.ts
@@ -100,13 +100,13 @@ export class AlphaClient<P extends ProceduresDef> {
     }
   }
 
-  async addSubscription<
+  addSubscription<
     K extends P['subscriptions']['key'] & string,
     TData = inferProcedureResult<P, 'subscriptions', K>,
   >(
     keyAndInput: [K, ..._inferProcedureHandlerInput<P, 'subscriptions', K>],
     opts: SubscriptionOptions<TData> & { context?: OperationContext }
-  ): Promise<() => void> {
+  ): () => void {
     try {
       const keyAndInput2 = this.mapQueryKey?.(keyAndInput) ?? keyAndInput
 
@@ -131,7 +131,10 @@ export class AlphaClient<P extends ProceduresDef> {
       return result.abort
     } catch (err) {
       if (err instanceof RSPCError) {
-        if (this.onError) await this.onError(err)
+        if (this.onError)
+          this.onError(err)?.catch(error => {
+            console.error('Failure during onError handler for addSubscription', error)
+          })
         return () => {}
       }
 

diff --git a/packages/react/src/v2.tsx b/packages/react/src/v2.tsx
@@ -145,13 +145,10 @@ export function createReactQueryHooks<P extends ProceduresDef>(
       if (!enabled) {
         return
       }
-      const subscription = client.addSubscription<K, TData>(keyAndInput, {
+      return client.addSubscription<K, TData>(keyAndInput, {
         onData: opts.onData,
         onError: opts.onError,
       })
-      return () => {
-        subscription.then(unsubscribe => unsubscribe())
-      }
     }, [queryKey, enabled])
   }