@ethlete/query 5.33.0 → 5.33.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/query
 
+## 5.33.2
+
+### Patch Changes
+
+- [`4fa6338`](https://github.com/ethlete-io/ethdk/commit/4fa63386c3af60d7843efb59592f7416b04330ac) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix web socket throwing an injection error
+
+## 5.33.1
+
+### Patch Changes
+
+- [`2991beb`](https://github.com/ethlete-io/ethdk/commit/2991beb64d12e3f2341c47ce1cdf954aa00000c0) Thanks [@TomTomB](https://github.com/TomTomB)! - Cleanup secure queries after logout
+
 ## 5.33.0
 
 ### Minor Changes

package/fesm2022/ethlete-query.mjs

@@ -2973,6 +2973,7 @@ const createAuthProviderQuery = (config, authProviderConfig) => {
 };
 const createBearerAuthProvider = (options) => {
     const route = injectRoute();
+    const client = inject(options.queryClientRef);
     const cookieEnabled = signal(options.cookie === undefined ? false : (options.cookie.enabled ?? true));
     const cookieOptions = {
         expiresInDays: 30,
@@ -3085,6 +3086,7 @@ const createBearerAuthProvider = (options) => {
         tokenRefreshQuery?.query.reset();
         selectRoleQuery?.query.reset();
         latestNonInternalQuery.set(null);
+        client.repository.unbindAllSecure();
     };
     const enableCookie = () => {
         if (isDevMode() && !options.cookie) {
@@ -4251,7 +4253,7 @@ const setupQueryExecuteState = () => {
     };
 };
 const queryExecute = (options) => {
-    const { executeOptions, args, executeState, options: runQueryOptions, internalOptions: internalRunQueryOptions, transformResponse, } = options;
+    const { executeOptions, args, executeState, options: runQueryOptions, internalOptions: internalRunQueryOptions, transformResponse, isSecure, } = options;
     const { deps, state, creator, creatorInternals, queryConfig } = executeOptions;
     const { key, request } = deps.client.repository.request({
         route: creatorInternals.route,
@@ -4263,6 +4265,7 @@ const queryExecute = (options) => {
         previousKey: executeState.previousKey(),
         internalRunQueryOptions,
         runQueryOptions,
+        isSecure,
     });
     executeState.previousKey.set(key);
     const responseSignal = transformResponse ? computed(() => transformResponse(request.response())) : request.response;
@@ -4353,7 +4356,7 @@ const createQueryRepository = (config) => {
         if (shouldCache && key) {
             const cacheEntry = cache.get(key);
             if (cacheEntry) {
-                bind(key, options.destroyRef, cacheEntry.request);
+                bind(key, options.destroyRef, cacheEntry.request, options.isSecure ?? false);
                 if (!runQueryOptions?.allowCache || cacheEntry.request.isStale()) {
                     cacheEntry.request.execute({ allowCache: runQueryOptions?.allowCache });
                 }
@@ -4373,7 +4376,7 @@ const createQueryRepository = (config) => {
         });
         request.execute();
         if (shouldCache && key) {
-            bind(key, options.destroyRef, request);
+            bind(key, options.destroyRef, request, options.isSecure ?? false);
         }
         return { key, request };
     };
@@ -4390,7 +4393,17 @@ const createQueryRepository = (config) => {
         }
         return true;
     };
-    const bind = (key, destroyRef, request) => {
+    const unbindAllSecure = () => {
+        for (const [key, cacheEntry] of cache.entries()) {
+            if (cacheEntry.isSecure) {
+                for (const destroyRef of cacheEntry.consumers.keys()) {
+                    unbind(key, destroyRef);
+                }
+                cache.delete(key);
+            }
+        }
+    };
+    const bind = (key, destroyRef, request, isSecure) => {
         const destroyListener = destroyRef.onDestroy(() => unbind(key, destroyRef));
         const cacheEntry = cache.get(key);
         if (cacheEntry) {
@@ -4402,12 +4415,14 @@ const createQueryRepository = (config) => {
             cache.set(key, {
                 consumers,
                 request,
+                isSecure,
             });
         }
     };
     const repository = {
         request,
         unbind,
+        unbindAllSecure,
     };
     return repository;
 };
@@ -4506,6 +4521,7 @@ const createSecureExecuteFn = (executeOptions) => {
             executeState,
             args: updatedArgs,
             options: runOptions,
+            isSecure: true,
         });
     };
     const exec = (executeArgs) => {
@@ -5170,6 +5186,8 @@ const createWebSocketClient = (config) => {
     const isConnected = signal(false);
     const joinRoom = (room) => {
         const roomFn = typeof room === 'function' ? room : () => room;
+        const pre = previousSignalValue(computed(() => roomFn()));
+        const roomData = signal(null);
         const join = (name) => {
             socket.emit('join-room', name);
             const existingRoom = rooms.get(name);
@@ -5182,8 +5200,6 @@ const createWebSocketClient = (config) => {
             rooms.set(name, newRoom);
             return newRoom;
         };
-        const pre = previousSignalValue(computed(() => roomFn()));
-        const roomData = signal(null);
         effect(() => {
             const current = roomFn();
             untracked(() => {
@@ -5223,7 +5239,7 @@ const createWebSocketClient = (config) => {
         socket.on('connect', () => {
             isConnected.set(true);
             for (const room of rooms.keys()) {
-                joinRoom(room);
+                socket.emit('join-room', room);
             }
         });
         socket.on('disconnect', () => isConnected.set(false));