fix: some connection issues

schummar · Oct 7, 2024 · 9754106 · 9754106
1 parent bda177b
commit 9754106
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 74 deletions.
diff --git a/src/core/commonTypes.ts b/src/core/commonTypes.ts
@@ -62,8 +62,8 @@ export interface UpdateFunction<Value> {
   (update: Update<Value>): void;
 }
 
-export interface AsyncUpdateFunction<Value, From extends any[] = [Value]> {
-  (update: UpdateFrom<MaybePromise<Value>, From>): void;
+export interface AsyncUpdateFunction<Value> {
+  (update: UpdateFrom<MaybePromise<Value>, [Value]>): void;
 }
 
 export interface Use {
@@ -75,7 +75,7 @@ export interface BaseConnectionActions<T> {
 }
 
 export interface AsyncConnectionActions<T> extends BaseConnectionActions<T> {
-  updateValue: AsyncUpdateFunction<T, [T | undefined]>;
+  updateValue: AsyncUpdateFunction<T>;
   updateError: (error: unknown) => void;
   updateIsConnected: (isConnected: boolean) => void;
   close: () => void;

diff --git a/src/lib/calculatedValue.ts b/src/lib/calculatedValue.ts
@@ -90,59 +90,76 @@ export function calculatedValue<T>(store: Store<T>, notify: () => void): Calcula
 
     const actions: AsyncConnectionActions<any> = {
       set(_value) {
-        if (connection?.active) {
-          q(() => {
-            value = _value;
-            notify();
-          });
-        }
+        q(() => {
+          if (!connection?.active) {
+            return;
+          }
+
+          value = _value;
+          notify();
+        });
       },
       updateValue(update) {
-        if (connection?.active) {
-          q(async () => {
-            if (update instanceof Function) {
-              const currentValue = await (value as Promise<T>).catch(() => undefined);
-
-              if (!connection?.active) {
-                return;
-              }
-
-              try {
-                update = update(currentValue);
-              } catch (error) {
-                value = PromiseWithState.reject(error) as T;
-                notify();
-                return;
-              }
-            }
+        q(async () => {
+          if (!connection?.active) {
+            return;
+          }
+
+          if (update instanceof Function) {
+            const currentValue = await value;
 
             if (!connection?.active) {
               return;
             }
 
-            value = PromiseWithState.resolve(update) as T;
-            notify();
-          });
-        }
+            try {
+              update = update(currentValue);
+            } catch (error) {
+              value = PromiseWithState.reject(error) as T;
+              notify();
+              connection.active = false;
+              connection.cancel?.();
+              return;
+            }
+          }
+
+          value = PromiseWithState.resolve(update) as T;
+          notify();
+        });
       },
       updateError(error) {
-        if (connection?.active) {
-          q(() => {
-            value = PromiseWithState.reject(error) as T;
-            notify();
-          });
-        }
+        q(() => {
+          if (!connection?.active) {
+            return;
+          }
+
+          connection.active = false;
+          connection.cancel?.();
+
+          if ('state' in store) {
+            (store as unknown as Cache<any>).state.set({
+              status: 'error',
+              error,
+              isConnected: false,
+              isUpdating: false,
+              isStale: false,
+            });
+          }
+
+          value = PromiseWithState.reject(error) as T;
+          notify();
+        });
       },
       updateIsConnected(isConnected) {
-        if (!connection?.active) {
-          return;
-        }
-
         if (isConnected) {
           whenConnected.resolve();
         }
 
         q(() => {
+          if (!connection?.active) {
+            return;
+          }
+
           if ('state' in store) {
             (store as unknown as Cache<any>).state.set('isConnected', isConnected);
           }
@@ -175,6 +192,12 @@ export function calculatedValue<T>(store: Store<T>, notify: () => void): Calcula
       value = store.getter({ signal: ac.signal, use, connect });
     } catch (error) {
       value = PromiseWithState.reject(error) as T;
+
+      if (connection) {
+        connection.active = false;
+        connection.cancel?.();
+        q.clear();
+      }
     }
   } else {
     value = store.getter;

diff --git a/test/core/cacheWithConnection.test.ts b/test/core/cacheWithConnection.test.ts
@@ -60,7 +60,7 @@ describe('cache with connection', () => {
         ws.addEventListener('open', () => updateIsConnected(true));
         ws.addEventListener('close', close);
         ws.addEventListener('message', (event) =>
-          updateValue((x = 0) => {
+          updateValue((x) => {
             return x + Number(event.data);
           }),
         );
@@ -252,40 +252,8 @@ describe('cache with connection', () => {
         status: 'error',
         error: new Error('Connection error'),
         isUpdating: false,
-        isConnected: true,
+        isConnected: false,
       },
     ]);
   });
-
-  test('reset error by setting new value', async () => {
-    const cache = createCache<number>(() => async ({ connect }) => {
-      await connect(({ updateValue, updateError, updateIsConnected }) => {
-        updateIsConnected(true);
-        updateError(new Error('Connection error'));
-        updateValue((x) => x ?? 1);
-        return () => {};
-      });
-
-      return 0;
-    });
-
-    const subscriber = vi.fn();
-    cache.subscribe(() => undefined);
-    cache.state.subscribe(subscriber);
-
-    await flushPromises();
-
-    expect(subscriber.mock.calls.map((x) => x[0])).toMatchObject([
-      { status: 'pending', isStale: true, isUpdating: true, isConnected: false },
-      { status: 'value', value: 0, isStale: false, isUpdating: false, isConnected: false },
-      { status: 'value', value: 0, isStale: false, isUpdating: false, isConnected: true },
-      {
-        status: 'error',
-        error: new Error('Connection error'),
-        isUpdating: false,
-        isConnected: true,
-      },
-      { status: 'value', value: 1, isStale: false, isUpdating: false, isConnected: true },
-    ]);
-  });
 });