akeyless-client-commons 1.1.17-test.8 → 1.1.17-test.9

package/dist/hooks/index.js

@@ -317,6 +317,9 @@ var __toCommonJS = function(mod) {
 // src/hooks/index.ts
 var index_exports = {};
 __export(index_exports, {
+    useDbSnapshots: function() {
+        return useDbSnapshots;
+    },
     useDeepCompareEffect: function() {
         return useDeepCompareEffect;
     },
@@ -332,20 +335,17 @@ __export(index_exports, {
     useSetUserCountry: function() {
         return useSetUserCountry;
     },
-    useSmartSnapshot: function() {
-        return useSmartSnapshot;
-    },
-    useSnapshotBulk: function() {
-        return useSnapshotBulk;
+    useSmartSnapshots: function() {
+        return useSmartSnapshots;
     },
-    useSocketSubscription: function() {
-        return useSocketSubscription;
+    useSocketSnapshots: function() {
+        return useSocketSnapshots;
     }
 });
 module.exports = __toCommonJS(index_exports);
 // src/hooks/global.ts
 var import_akeyless_types_commons2 = require("akeyless-types-commons");
-var import_react5 = require("react");
+var import_react2 = require("react");
 // src/helpers/firebase.ts
 var import_moment = __toESM(require("moment"));
 var import_app = require("firebase/app");
@@ -518,11 +518,11 @@ var snapshot = function(config, snapshotsFirstTime, settings) {
             collectionRef = (0, import_firestore.query)(collectionRef, (0, import_firestore.orderBy)(order.fieldName, order.direction));
         });
     }
-    var unsubscribe = (0, import_firestore.onSnapshot)(collectionRef, function(snapshot2) {
+    var unsubscribe = (0, import_firestore.onSnapshot)(collectionRef, function(snapshot3) {
         if (!snapshotsFirstTime.includes(config.collectionName)) {
             var _config_onFirstTime, _config_extraParsers;
             snapshotsFirstTime.push(config.collectionName);
-            var documents = snapshot2.docs.map(function(doc2) {
+            var documents = snapshot3.docs.map(function(doc2) {
                 return simpleExtractData(doc2);
             });
             (_config_onFirstTime = config.onFirstTime) === null || _config_onFirstTime === void 0 ? void 0 : _config_onFirstTime.call(config, documents, config);
@@ -536,7 +536,7 @@ var snapshot = function(config, snapshotsFirstTime, settings) {
             var addedDocs = [];
             var modifiedDocs = [];
             var removedDocs = [];
-            snapshot2.docChanges().forEach(function(change) {
+            snapshot3.docChanges().forEach(function(change) {
                 if (change.type === "added") {
                     addedDocs.push(simpleExtractData(change.doc));
                 } else if (change.type === "modified") {
@@ -644,6 +644,7 @@ var dataSocketDomain = isLocal ? "http://localhost:9009/api/data-socket" : baseD
 var dataSyncDomain = isLocal ? "http://localhost:9010/api/data-sync" : baseDomain + "/data-sync";
 // src/helpers/socket.ts
 var import_socket = require("socket.io-client");
+var SESSION_STORAGE_KEY = "sessionId";
 var SocketService = /*#__PURE__*/ function() {
     "use strict";
     function _SocketService() {
@@ -663,19 +664,24 @@ var SocketService = /*#__PURE__*/ function() {
                     var socketUrl = isLocal ? "http://localhost:9009" : mode === "qa" ? "https://nx-api.xyz" : "https://nx-api.info";
                     this.socket = (0, import_socket.io)(socketUrl, {
                         path: "/api/data-socket/connect",
-                        transports: [
-                            "websocket"
-                        ],
-                        auth: this.authToken ? {
-                            token: this.authToken
-                        } : void 0
+                        auth: function(cb) {
+                            var sessionId = localStorage.getItem(SESSION_STORAGE_KEY) || void 0;
+                            var token = _this.authToken;
+                            var authPayload = {};
+                            if (token) authPayload.token = token;
+                            if (sessionId) authPayload.sessionId = sessionId;
+                            cb(authPayload);
+                        },
+                        reconnection: true,
+                        reconnectionAttempts: 30,
+                        reconnectionDelay: 2 * 1e3
                     });
                     this.socket.on("connect", function() {
-                        var _this_socket;
-                        console.log("Socket connected:", (_this_socket = _this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.id);
-                    });
-                    this.connectCallbacks.forEach(function(cb) {
-                        return cb();
+                        var _this_socket, _this_socket1;
+                        console.log("\uD83D\uDFE2 Socket connected: ".concat((_this_socket = _this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.id, " (recovered - ").concat((_this_socket1 = _this.socket) === null || _this_socket1 === void 0 ? void 0 : _this_socket1.recovered, ")"));
+                        _this.connectCallbacks.forEach(function(cb) {
+                            return cb();
+                        });
                     });
                     this.socket.on("disconnect", function(reason) {
                         console.log("Socket disconnected:", reason);
@@ -683,6 +689,12 @@ var SocketService = /*#__PURE__*/ function() {
                             return cb();
                         });
                     });
+                    this.socket.on("session", function(param) {
+                        var sessionId = param.sessionId;
+                        if (sessionId) {
+                            localStorage.setItem(SESSION_STORAGE_KEY, sessionId);
+                        }
+                    });
                     this.socket.on("connect_error", function(error) {
                         console.error("Socket connection error:", error);
                     });
@@ -705,10 +717,90 @@ var SocketService = /*#__PURE__*/ function() {
                 return this.socket;
             }
         },
+        {
+            /// connection management methods
+            key: "startSession",
+            value: function startSession(token) {
+                this.setAuthToken(token);
+                this.initSocket();
+            }
+        },
+        {
+            key: "onConnect",
+            value: function onConnect(callback) {
+                var _this = this;
+                var _this_socket;
+                if (!this.connectCallbacks.includes(callback)) {
+                    this.connectCallbacks.push(callback);
+                }
+                if ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) {
+                    callback();
+                }
+                return function() {
+                    return _this.offConnect(callback);
+                };
+            }
+        },
+        {
+            key: "offConnect",
+            value: function offConnect(callback) {
+                this.connectCallbacks = this.connectCallbacks.filter(function(cb) {
+                    return cb !== callback;
+                });
+            }
+        },
+        {
+            key: "onDisconnect",
+            value: function onDisconnect(callback) {
+                var _this = this;
+                if (!this.disconnectCallbacks.includes(callback)) {
+                    this.disconnectCallbacks.push(callback);
+                }
+                if (this.socket && !this.socket.connected) {
+                    callback();
+                }
+                return function() {
+                    return _this.offDisconnect(callback);
+                };
+            }
+        },
+        {
+            key: "offDisconnect",
+            value: function offDisconnect(callback) {
+                this.disconnectCallbacks = this.disconnectCallbacks.filter(function(cb) {
+                    return cb !== callback;
+                });
+            }
+        },
+        {
+            key: "isConnected",
+            value: function isConnected() {
+                var _this_socket;
+                return ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) || false;
+            }
+        },
+        {
+            key: "setAuthToken",
+            value: function setAuthToken(token) {
+                this.authToken = token;
+                if (this.socket) {
+                    this.socket.connect();
+                }
+            }
+        },
+        {
+            key: "disconnectSocket",
+            value: function disconnectSocket() {
+                if (this.socket) {
+                    this.socket.io.engine.close();
+                }
+            }
+        },
         {
             /// subscribe to collections
             key: "subscribeToCollections",
             value: function subscribeToCollections(config) {
+                var _this = this;
                 if (config.length === 0) {
                     return function() {};
                 }
@@ -719,48 +811,24 @@ 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;
-                    s.on("initial:".concat(collectionName), onFirstTime);
-                    eventHandlers.push({
-                        eventName: "initial:".concat(collectionName),
-                        handler: onFirstTime
-                    });
-                    s.on("add:".concat(collectionName), onAdd);
-                    eventHandlers.push({
-                        eventName: "add:".concat(collectionName),
-                        handler: onAdd
-                    });
-                    s.on("update:".concat(collectionName), onModify);
-                    eventHandlers.push({
-                        eventName: "update:".concat(collectionName),
-                        handler: onModify
-                    });
-                    s.on("delete:".concat(collectionName), onRemove);
-                    eventHandlers.push({
-                        eventName: "delete:".concat(collectionName),
-                        handler: onRemove
-                    });
-                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
-                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
-                        s.on("initial:".concat(collectionName), extraOnFirstTime);
-                        eventHandlers.push({
-                            eventName: "initial:".concat(collectionName),
-                            handler: extraOnFirstTime
-                        });
-                        s.on("add:".concat(collectionName), extraOnAdd);
-                        eventHandlers.push({
-                            eventName: "add:".concat(collectionName),
-                            handler: extraOnAdd
-                        });
-                        s.on("update:".concat(collectionName), extraOnModify);
-                        eventHandlers.push({
-                            eventName: "update:".concat(collectionName),
-                            handler: extraOnModify
-                        });
-                        s.on("delete:".concat(collectionName), extraOnRemove);
+                    var attach = function(eventName, handler) {
+                        _this.socket.off(eventName, handler);
+                        _this.socket.on(eventName, handler);
                         eventHandlers.push({
-                            eventName: "delete:".concat(collectionName),
-                            handler: extraOnRemove
+                            eventName: eventName,
+                            handler: handler
                         });
+                    };
+                    attach("initial:".concat(collectionName), onFirstTime);
+                    attach("add:".concat(collectionName), onAdd);
+                    attach("update:".concat(collectionName), onModify);
+                    attach("delete:".concat(collectionName), onRemove);
+                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
+                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
+                        attach("initial:".concat(collectionName), extraOnFirstTime);
+                        attach("add:".concat(collectionName), extraOnAdd);
+                        attach("update:".concat(collectionName), extraOnModify);
+                        attach("delete:".concat(collectionName), extraOnRemove);
                     });
                 });
                 s.emit("subscribe_collections", collectionsNames, function(callback) {
@@ -861,64 +929,6 @@ var SocketService = /*#__PURE__*/ function() {
                     });
                 });
             }
-        },
-        {
-            /// connection management methods
-            key: "onConnect",
-            value: function onConnect(callback) {
-                var _this_socket;
-                this.connectCallbacks.push(callback);
-                if ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) {
-                    callback();
-                }
-            }
-        },
-        {
-            key: "offConnect",
-            value: function offConnect(callback) {
-                this.connectCallbacks = this.connectCallbacks.filter(function(cb) {
-                    return cb !== callback;
-                });
-            }
-        },
-        {
-            key: "onDisconnect",
-            value: function onDisconnect(callback) {
-                this.disconnectCallbacks.push(callback);
-                if (this.socket && !this.socket.connected) {
-                    callback();
-                }
-            }
-        },
-        {
-            key: "offDisconnect",
-            value: function offDisconnect(callback) {
-                this.disconnectCallbacks = this.disconnectCallbacks.filter(function(cb) {
-                    return cb !== callback;
-                });
-            }
-        },
-        {
-            key: "isConnected",
-            value: function isConnected() {
-                var _this_socket;
-                return ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) || false;
-            }
-        },
-        {
-            key: "setAuthToken",
-            value: function setAuthToken(token) {
-                this.authToken = token;
-                if (this.socket) {
-                    this.socket.auth = {
-                        token: token
-                    };
-                    if (this.socket.connected) {
-                        this.socket.disconnect();
-                    }
-                    this.socket.connect();
-                }
-            }
         }
     ], [
         {
@@ -934,11 +944,54 @@ var SocketService = /*#__PURE__*/ function() {
     return _SocketService;
 }();
 var socketServiceInstance = SocketService.getInstance();
+// src/hooks/global.ts
+var useDocumentTitle = function(title) {
+    (0, import_react2.useEffect)(function() {
+        document.title = title;
+    }, [
+        title
+    ]);
+    return null;
+};
+var useSetUserCountry = function(setUserCountry, changLang) {
+    (0, import_react2.useLayoutEffect)(function() {
+        var currentCountry = localStorage.getItem("userCountry");
+        if (!currentCountry) {
+            var updateCountry = /*#__PURE__*/ function() {
+                var _ref = _async_to_generator(function() {
+                    var country;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    getUserCountryByIp()
+                                ];
+                            case 1:
+                                country = _state.sent();
+                                changLang(country === import_akeyless_types_commons2.CountryOptions.IL ? "he" : "en");
+                                setUserCountry(country);
+                                localStorage.setItem("userCountry", country);
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                });
+                return function updateCountry() {
+                    return _ref.apply(this, arguments);
+                };
+            }();
+            updateCountry();
+        }
+    }, []);
+    return null;
+};
 // src/hooks/react.ts
 var import_lodash2 = require("lodash");
-var import_react2 = require("react");
+var import_react3 = require("react");
 function useSafeEffect(callback, dependencies, error_message) {
-    (0, import_react2.useEffect)(function() {
+    (0, import_react3.useEffect)(function() {
         try {
             callback();
         } catch (error) {
@@ -947,80 +1000,88 @@ function useSafeEffect(callback, dependencies, error_message) {
     }, dependencies);
 }
 var useDeepCompareMemo = function(factory, dependencies) {
-    var previousDepsRef = (0, import_react2.useRef)([]);
+    var previousDepsRef = (0, import_react3.useRef)([]);
     if (!(0, import_lodash2.isEqual)(dependencies, previousDepsRef.current)) {
         previousDepsRef.current = dependencies;
     }
-    return (0, import_react2.useMemo)(factory, previousDepsRef.current);
+    return (0, import_react3.useMemo)(factory, previousDepsRef.current);
 };
 function useDeepCompareEffect(effect, dependencies) {
-    var previousDepsRef = (0, import_react2.useRef)();
+    var previousDepsRef = (0, import_react3.useRef)();
     if (!(0, import_lodash2.isEqual)(previousDepsRef.current, dependencies)) {
         previousDepsRef.current = dependencies;
     }
-    (0, import_react2.useEffect)(effect, [
+    (0, import_react3.useEffect)(effect, [
         previousDepsRef.current
     ]);
 }
-// src/hooks/socket.ts
-var import_react3 = require("react");
-var useSocketSubscription = function(configs, label, settings) {
-    var _ref = _sliced_to_array((0, import_react3.useState)(socketServiceInstance.isConnected()), 2), socketConnected = _ref[0], setSocketConnected = _ref[1];
-    var _ref1 = _sliced_to_array((0, import_react3.useState)([]), 2), cleanupSubscriptions = _ref1[0], setCleanupSubscriptions = _ref1[1];
+// src/hooks/WebWorker.ts
+var import_react4 = require("react");
+// src/hooks/snapshots.ts
+var import_react5 = require("react");
+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 socketStarted = (0, import_react5.useRef)(false);
     useDeepCompareEffect(function() {
         if (!auth.currentUser) {
             return;
         }
-        if (socketConnected) {
+        var subscribe = function() {
+            if (configs.length === 0) {
+                return;
+            }
+            var disposer = socketServiceInstance.subscribeToCollections(configs);
             setCleanupSubscriptions(function(prev) {
                 return _to_consumable_array(prev).concat([
-                    socketServiceInstance.subscribeToCollections(configs)
+                    disposer
                 ]);
             });
-            if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
+            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;
                 }).join(", ")));
             }
-        } else {
+        };
+        if (socketServiceInstance.isConnected()) {
+            setSocketConnected(true);
+            subscribe();
+        } else if (!socketStarted.current) {
+            socketStarted.current = true;
             auth.currentUser.getIdToken().then(function(token) {
-                socketServiceInstance.setAuthToken(token);
-                socketServiceInstance.getSocketInstance();
-                if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
+                socketServiceInstance.startSession(token);
+                if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                     console.log("==> ".concat(label || "Cache snapshots", " started... "));
                 }
             });
         }
-        var uiOnConnect = function() {
+        var offConnect = socketServiceInstance.onConnect(function() {
             setSocketConnected(true);
-        };
-        var uiOnDisconnect = function() {
+            socketStarted.current = false;
+            subscribe();
+        });
+        var offDisconnect = socketServiceInstance.onDisconnect(function() {
+            setSocketConnected(false);
             cleanupSubscriptions.forEach(function(cleanup) {
                 return cleanup();
             });
-            setSocketConnected(false);
-        };
-        socketServiceInstance.onConnect(uiOnConnect);
-        socketServiceInstance.onDisconnect(uiOnDisconnect);
-        setSocketConnected(socketServiceInstance.isConnected());
+        });
         return function() {
-            if (settings === null || settings === void 0 ? void 0 : settings.cleanupForConfigChange) {
-                cleanupSubscriptions.forEach(function(cleanup) {
-                    return cleanup();
-                });
-                socketServiceInstance.offConnect(uiOnConnect);
-                socketServiceInstance.offDisconnect(uiOnDisconnect);
-            }
+            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. "));
             }
         };
     }, [
-        socketConnected,
         configs,
-        auth
+        (_auth_currentUser = auth.currentUser) === null || _auth_currentUser === void 0 ? void 0 : _auth_currentUser.uid
     ]);
-    (0, import_react3.useEffect)(function() {
+    (0, import_react5.useEffect)(function() {
         return function() {
             cleanupSubscriptions.forEach(function(cleanup) {
                 return cleanup();
@@ -1031,16 +1092,7 @@ var useSocketSubscription = function(configs, label, settings) {
         socketConnected: socketConnected
     };
 };
-// src/hooks/global.ts
-var useDocumentTitle = function(title) {
-    (0, import_react5.useEffect)(function() {
-        document.title = title;
-    }, [
-        title
-    ]);
-    return null;
-};
-var useSnapshotBulk = function(configs, label, settings) {
+var useDbSnapshots = function(configs, label, settings) {
     var snapshotsFirstTime = (0, import_react5.useRef)([]);
     var unsubscribeFunctions = (0, import_react5.useRef)([]);
     useDeepCompareEffect(function() {
@@ -1091,7 +1143,7 @@ var useSnapshotBulk = function(configs, label, settings) {
         };
     }, []);
 };
-var useSmartSnapshot = function(configs, label, settings) {
+var useSmartSnapshots = function(configs, label, settings) {
     var _ref = _sliced_to_array((0, import_react5.useState)(null), 2), cacheCollectionsConfig = _ref[0], setCacheCollectionsConfig = _ref[1];
     (0, import_react5.useEffect)(function() {
         get_document_by_id("nx-settings", "cache_collections_config").then(function(res) {
@@ -1126,58 +1178,22 @@ var useSmartSnapshot = function(configs, label, settings) {
         configs,
         cacheCollectionsConfig
     ]);
-    useSnapshotBulk(groupedConfig.configForDb, label, settings);
-    var socketConnected = useSocketSubscription(groupedConfig.configForCache, label, settings).socketConnected;
+    useDbSnapshots(groupedConfig.configForDb, label, settings);
+    var socketConnected = useSocketSnapshots(groupedConfig.configForCache, label, settings).socketConnected;
     return {
         groupedConfig: groupedConfig,
         socketConnected: socketConnected
     };
 };
-var useSetUserCountry = function(setUserCountry, changLang) {
-    (0, import_react5.useLayoutEffect)(function() {
-        var currentCountry = localStorage.getItem("userCountry");
-        if (!currentCountry) {
-            var updateCountry = /*#__PURE__*/ function() {
-                var _ref = _async_to_generator(function() {
-                    var country;
-                    return _ts_generator(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                return [
-                                    4,
-                                    getUserCountryByIp()
-                                ];
-                            case 1:
-                                country = _state.sent();
-                                changLang(country === import_akeyless_types_commons2.CountryOptions.IL ? "he" : "en");
-                                setUserCountry(country);
-                                localStorage.setItem("userCountry", country);
-                                return [
-                                    2
-                                ];
-                        }
-                    });
-                });
-                return function updateCountry() {
-                    return _ref.apply(this, arguments);
-                };
-            }();
-            updateCountry();
-        }
-    }, []);
-    return null;
-};
-// src/hooks/WebWorker.ts
-var import_react7 = require("react");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+    useDbSnapshots: useDbSnapshots,
     useDeepCompareEffect: useDeepCompareEffect,
     useDeepCompareMemo: useDeepCompareMemo,
     useDocumentTitle: useDocumentTitle,
     useSafeEffect: useSafeEffect,
     useSetUserCountry: useSetUserCountry,
-    useSmartSnapshot: useSmartSnapshot,
-    useSnapshotBulk: useSnapshotBulk,
-    useSocketSubscription: useSocketSubscription
+    useSmartSnapshots: useSmartSnapshots,
+    useSocketSnapshots: useSocketSnapshots
 });
 //# sourceMappingURL=index.js.map