akeyless-client-commons 1.1.29 → 1.1.31

package/dist/helpers/index.js

@@ -1446,9 +1446,14 @@ var snapshot = function(config, snapshotsFirstTime, settings) {
         });
     }
     var unsubscribe = (0, import_firestore.onSnapshot)(collectionRef, function(snapshot2) {
-        if (!snapshotsFirstTime.includes(config.collectionName)) {
+        var firstTimeKey = JSON.stringify({
+            collectionName: config.collectionName,
+            conditions: config.conditions || [],
+            orderBy: config.orderBy || []
+        });
+        if (!snapshotsFirstTime.includes(firstTimeKey)) {
             var _config_onFirstTime, _config_extraParsers;
-            snapshotsFirstTime.push(config.collectionName);
+            snapshotsFirstTime.push(firstTimeKey);
             var documents = snapshot2.docs.map(function(doc2) {
                 return simpleExtractData(doc2);
             });
@@ -2720,7 +2725,7 @@ var SocketService = /*#__PURE__*/ function() {
             key: "disconnectSocket",
             value: function disconnectSocket() {
                 if (this.socket) {
-                    this.socket.io.engine.close();
+                    this.socket.disconnect();
                 }
             }
         },
@@ -2738,8 +2743,9 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers, conditions = configuration.conditions, orderBy2 = configuration.orderBy;
+                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
                     var attach = function(eventName, handler) {
+                        if (!handler) return;
                         _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({

package/dist/helpers/index.mjs

@@ -1068,9 +1068,14 @@ var snapshot = function(config, snapshotsFirstTime, settings) {
         });
     }
     var unsubscribe = onSnapshot(collectionRef, function(snapshot2) {
-        if (!snapshotsFirstTime.includes(config.collectionName)) {
+        var firstTimeKey = JSON.stringify({
+            collectionName: config.collectionName,
+            conditions: config.conditions || [],
+            orderBy: config.orderBy || []
+        });
+        if (!snapshotsFirstTime.includes(firstTimeKey)) {
             var _config_onFirstTime, _config_extraParsers;
-            snapshotsFirstTime.push(config.collectionName);
+            snapshotsFirstTime.push(firstTimeKey);
             var documents = snapshot2.docs.map(function(doc2) {
                 return simpleExtractData(doc2);
             });
@@ -2341,7 +2346,7 @@ var SocketService = /*#__PURE__*/ function() {
             key: "disconnectSocket",
             value: function disconnectSocket() {
                 if (this.socket) {
-                    this.socket.io.engine.close();
+                    this.socket.disconnect();
                 }
             }
         },
@@ -2359,8 +2364,9 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers, conditions = configuration.conditions, orderBy2 = configuration.orderBy;
+                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
                     var attach = function(eventName, handler) {
+                        if (!handler) return;
                         _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({

package/dist/hooks/index.js

@@ -7,9 +7,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -71,9 +68,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -101,9 +95,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -146,9 +137,6 @@ function _object_spread_props(target, source) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -520,9 +508,14 @@ var snapshot = function(config, snapshotsFirstTime, settings) {
         });
     }
     var unsubscribe = (0, import_firestore.onSnapshot)(collectionRef, function(snapshot3) {
-        if (!snapshotsFirstTime.includes(config.collectionName)) {
+        var firstTimeKey = JSON.stringify({
+            collectionName: config.collectionName,
+            conditions: config.conditions || [],
+            orderBy: config.orderBy || []
+        });
+        if (!snapshotsFirstTime.includes(firstTimeKey)) {
             var _config_onFirstTime, _config_extraParsers;
-            snapshotsFirstTime.push(config.collectionName);
+            snapshotsFirstTime.push(firstTimeKey);
             var documents = snapshot3.docs.map(function(doc2) {
                 return simpleExtractData(doc2);
             });
@@ -798,7 +791,7 @@ var SocketService = /*#__PURE__*/ function() {
             key: "disconnectSocket",
             value: function disconnectSocket() {
                 if (this.socket) {
-                    this.socket.io.engine.close();
+                    this.socket.disconnect();
                 }
             }
         },
@@ -816,8 +809,9 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers, conditions = configuration.conditions, orderBy2 = configuration.orderBy;
+                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
                     var attach = function(eventName, handler) {
+                        if (!handler) return;
                         _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({
@@ -1029,6 +1023,9 @@ var useDbSnapshots = function(configs, label, settings) {
     var snapshotsFirstTime = (0, import_react5.useRef)([]);
     var unsubscribeFunctions = (0, import_react5.useRef)([]);
     useDeepCompareEffect(function() {
+        if (configs.length === 0) {
+            return;
+        }
         var start = performance.now();
         if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
             console.log("==> ".concat(label || "DB snapshots", " started from db... "));
@@ -1121,22 +1118,25 @@ var useSmartSnapshots = function(configs, label, settings) {
 var useSocketSnapshots = function(configs, label, settings) {
     var _auth_currentUser;
     var _ref = _sliced_to_array((0, import_react5.useState)(socketServiceInstance.isConnected()), 2), socketConnected = _ref[0], setSocketConnected = _ref[1];
-    var _ref1 = _sliced_to_array((0, import_react5.useState)([]), 2), cleanupSubscriptions = _ref1[0], setCleanupSubscriptions = _ref1[1];
+    var cleanupSubscriptionsRef = (0, import_react5.useRef)([]);
     var socketStarted = (0, import_react5.useRef)(false);
     useDeepCompareEffect(function() {
+        var isActive = true;
         if (!auth.currentUser) {
             return;
         }
+        var clearSubs = function() {
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
+                return cleanup();
+            });
+            cleanupSubscriptionsRef.current = [];
+        };
         var subscribe = function() {
             if (configs.length === 0) {
                 return;
             }
             var disposer = socketServiceInstance.subscribeToCollections(configs);
-            setCleanupSubscriptions(function(prev) {
-                return _to_consumable_array(prev).concat([
-                    disposer
-                ]);
-            });
+            cleanupSubscriptionsRef.current.push(disposer);
             if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                 console.log("==> ".concat(label || "Cache snapshots", " subscribed to ").concat(configs.map(function(c) {
                     return c.collectionName;
@@ -1145,46 +1145,64 @@ var useSocketSnapshots = function(configs, label, settings) {
         };
         if (socketServiceInstance.isConnected()) {
             setSocketConnected(true);
+            clearSubs();
             subscribe();
         } else if (!socketStarted.current) {
             socketStarted.current = true;
             auth.currentUser.getIdToken().then(function(token) {
+                if (!isActive) return;
                 socketServiceInstance.startSession(token);
                 if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                     console.log("==> ".concat(label || "Cache snapshots", " started... "));
                 }
-            });
+            }).catch(function() {});
         }
         var offConnect = socketServiceInstance.onConnect(function() {
+            if (!isActive) return;
             setSocketConnected(true);
             socketStarted.current = false;
+            clearSubs();
             subscribe();
         });
         var offDisconnect = socketServiceInstance.onDisconnect(function() {
+            if (!isActive) return;
             setSocketConnected(false);
-            cleanupSubscriptions.forEach(function(cleanup) {
-                return cleanup();
-            });
+            clearSubs();
         });
-        return function() {
-            cleanupSubscriptions.forEach(function(cleanup) {
-                return cleanup();
-            });
-            offConnect === null || offConnect === void 0 ? void 0 : offConnect();
-            offDisconnect === null || offDisconnect === void 0 ? void 0 : offDisconnect();
-            if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
-                console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
-            }
-        };
+        if (settings === null || settings === void 0 ? void 0 : settings.cleanupForConfigChange) {
+            return function() {
+                isActive = false;
+                clearSubs();
+                offConnect();
+                offDisconnect();
+                if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
+                    console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
+                }
+            };
+        }
     }, [
         configs,
         (_auth_currentUser = auth.currentUser) === null || _auth_currentUser === void 0 ? void 0 : _auth_currentUser.uid
     ]);
     (0, import_react5.useEffect)(function() {
+        var _auth_onIdTokenChanged;
+        var unsubscribeAuth = (_auth_onIdTokenChanged = auth.onIdTokenChanged) === null || _auth_onIdTokenChanged === void 0 ? void 0 : _auth_onIdTokenChanged.call(auth, function(user) {
+            if (!user) return;
+            user.getIdToken().then(function(token) {
+                return socketServiceInstance.setAuthToken(token);
+            }).catch(function() {});
+        });
         return function() {
-            cleanupSubscriptions.forEach(function(cleanup) {
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
                 return cleanup();
             });
+            cleanupSubscriptionsRef.current = [];
+            if (typeof unsubscribeAuth === "function") {
+                unsubscribeAuth();
+            }
+            if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
+                console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
+            }
         };
     }, []);
     return {

package/dist/hooks/index.mjs

@@ -7,9 +7,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -71,9 +68,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -101,9 +95,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -146,9 +137,6 @@ function _object_spread_props(target, source) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -427,9 +415,14 @@ var snapshot = function(config, snapshotsFirstTime, settings) {
         });
     }
     var unsubscribe = onSnapshot(collectionRef, function(snapshot3) {
-        if (!snapshotsFirstTime.includes(config.collectionName)) {
+        var firstTimeKey = JSON.stringify({
+            collectionName: config.collectionName,
+            conditions: config.conditions || [],
+            orderBy: config.orderBy || []
+        });
+        if (!snapshotsFirstTime.includes(firstTimeKey)) {
             var _config_onFirstTime, _config_extraParsers;
-            snapshotsFirstTime.push(config.collectionName);
+            snapshotsFirstTime.push(firstTimeKey);
             var documents = snapshot3.docs.map(function(doc2) {
                 return simpleExtractData(doc2);
             });
@@ -704,7 +697,7 @@ var SocketService = /*#__PURE__*/ function() {
             key: "disconnectSocket",
             value: function disconnectSocket() {
                 if (this.socket) {
-                    this.socket.io.engine.close();
+                    this.socket.disconnect();
                 }
             }
         },
@@ -722,8 +715,9 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers, conditions = configuration.conditions, orderBy2 = configuration.orderBy;
+                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
                     var attach = function(eventName, handler) {
+                        if (!handler) return;
                         _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({
@@ -935,6 +929,9 @@ var useDbSnapshots = function(configs, label, settings) {
     var snapshotsFirstTime = useRef4([]);
     var unsubscribeFunctions = useRef4([]);
     useDeepCompareEffect(function() {
+        if (configs.length === 0) {
+            return;
+        }
         var start = performance.now();
         if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
             console.log("==> ".concat(label || "DB snapshots", " started from db... "));
@@ -1027,22 +1024,25 @@ var useSmartSnapshots = function(configs, label, settings) {
 var useSocketSnapshots = function(configs, label, settings) {
     var _auth_currentUser;
     var _useState2 = _sliced_to_array(useState2(socketServiceInstance.isConnected()), 2), socketConnected = _useState2[0], setSocketConnected = _useState2[1];
-    var _useState21 = _sliced_to_array(useState2([]), 2), cleanupSubscriptions = _useState21[0], setCleanupSubscriptions = _useState21[1];
+    var cleanupSubscriptionsRef = useRef4([]);
     var socketStarted = useRef4(false);
     useDeepCompareEffect(function() {
+        var isActive = true;
         if (!auth.currentUser) {
             return;
         }
+        var clearSubs = function() {
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
+                return cleanup();
+            });
+            cleanupSubscriptionsRef.current = [];
+        };
         var subscribe = function() {
             if (configs.length === 0) {
                 return;
             }
             var disposer = socketServiceInstance.subscribeToCollections(configs);
-            setCleanupSubscriptions(function(prev) {
-                return _to_consumable_array(prev).concat([
-                    disposer
-                ]);
-            });
+            cleanupSubscriptionsRef.current.push(disposer);
             if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                 console.log("==> ".concat(label || "Cache snapshots", " subscribed to ").concat(configs.map(function(c) {
                     return c.collectionName;
@@ -1051,46 +1051,64 @@ var useSocketSnapshots = function(configs, label, settings) {
         };
         if (socketServiceInstance.isConnected()) {
             setSocketConnected(true);
+            clearSubs();
             subscribe();
         } else if (!socketStarted.current) {
             socketStarted.current = true;
             auth.currentUser.getIdToken().then(function(token) {
+                if (!isActive) return;
                 socketServiceInstance.startSession(token);
                 if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                     console.log("==> ".concat(label || "Cache snapshots", " started... "));
                 }
-            });
+            }).catch(function() {});
         }
         var offConnect = socketServiceInstance.onConnect(function() {
+            if (!isActive) return;
             setSocketConnected(true);
             socketStarted.current = false;
+            clearSubs();
             subscribe();
         });
         var offDisconnect = socketServiceInstance.onDisconnect(function() {
+            if (!isActive) return;
             setSocketConnected(false);
-            cleanupSubscriptions.forEach(function(cleanup) {
-                return cleanup();
-            });
+            clearSubs();
         });
-        return function() {
-            cleanupSubscriptions.forEach(function(cleanup) {
-                return cleanup();
-            });
-            offConnect === null || offConnect === void 0 ? void 0 : offConnect();
-            offDisconnect === null || offDisconnect === void 0 ? void 0 : offDisconnect();
-            if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
-                console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
-            }
-        };
+        if (settings === null || settings === void 0 ? void 0 : settings.cleanupForConfigChange) {
+            return function() {
+                isActive = false;
+                clearSubs();
+                offConnect();
+                offDisconnect();
+                if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
+                    console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
+                }
+            };
+        }
     }, [
         configs,
         (_auth_currentUser = auth.currentUser) === null || _auth_currentUser === void 0 ? void 0 : _auth_currentUser.uid
     ]);
     useEffect4(function() {
+        var _auth_onIdTokenChanged;
+        var unsubscribeAuth = (_auth_onIdTokenChanged = auth.onIdTokenChanged) === null || _auth_onIdTokenChanged === void 0 ? void 0 : _auth_onIdTokenChanged.call(auth, function(user) {
+            if (!user) return;
+            user.getIdToken().then(function(token) {
+                return socketServiceInstance.setAuthToken(token);
+            }).catch(function() {});
+        });
         return function() {
-            cleanupSubscriptions.forEach(function(cleanup) {
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
                 return cleanup();
             });
+            cleanupSubscriptionsRef.current = [];
+            if (typeof unsubscribeAuth === "function") {
+                unsubscribeAuth();
+            }
+            if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
+                console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
+            }
         };
     }, []);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "akeyless-client-commons",
-    "version": "1.1.29",
+    "version": "1.1.31",
     "scripts": {
         "build": "tsup",
         "deploy": "npm run build && npm version patch --no-git-tag-version && npm publish",