akeyless-client-commons 1.1.36 → 1.1.38

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);
@@ -78,9 +75,6 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-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;
@@ -108,9 +102,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] : {};
@@ -153,9 +144,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);
@@ -954,6 +942,37 @@ var useWebWorker = function(fn, options) {
         if (!isSupportedRef.current) {
             return function() {};
         }
+        if (options === null || options === void 0 ? void 0 : options.warmStart) {
+            try {
+                ensureWorker();
+            } catch (error) {
+                console.error("Error creating worker", error);
+            }
+        }
+        return function() {
+            if (workerRef.current) {
+                workerRef.current.terminate();
+                workerRef.current = null;
+            }
+            if (workerUrlRef.current) {
+                URL.revokeObjectURL(workerUrlRef.current);
+                workerUrlRef.current = null;
+            }
+            pendingJobsRef.current.forEach(function(job) {
+                job.reject(new Error("Worker terminated"));
+            });
+            pendingJobsRef.current.clear();
+            isReadyRef.current = false;
+        };
+    }, [
+        fn,
+        options === null || options === void 0 ? void 0 : options.debug,
+        options === null || options === void 0 ? void 0 : options.name,
+        options === null || options === void 0 ? void 0 : options.onError
+    ]);
+    var ensureWorker = useCallback2(function() {
+        if (!isSupportedRef.current) return;
+        if (workerRef.current) return;
         var functionString = fn.toString();
         var workerSource = [
             "const userFn = (".concat(functionString, ");"),
@@ -1007,30 +1026,23 @@ var useWebWorker = function(fn, options) {
                 job.reject(err);
             });
             pendingJobsRef.current.clear();
-        };
-        if (workerRef.current) {
-            workerRef.current.terminate();
-        }
-        if (workerUrlRef.current) {
-            URL.revokeObjectURL(workerUrlRef.current);
-        }
-        workerRef.current = worker;
-        workerUrlRef.current = url;
-        return function() {
-            if (workerRef.current) {
-                workerRef.current.terminate();
+            if (options === null || options === void 0 ? void 0 : options.recreateOnError) {
+                try {
+                    var _workerRef_current;
+                    (_workerRef_current = workerRef.current) === null || _workerRef_current === void 0 ? void 0 : _workerRef_current.terminate();
+                } catch (_) {}
                 workerRef.current = null;
+                if (workerUrlRef.current) {
+                    try {
+                        URL.revokeObjectURL(workerUrlRef.current);
+                    } catch (_) {}
+                    workerUrlRef.current = null;
+                }
+                isReadyRef.current = false;
             }
-            if (workerUrlRef.current) {
-                URL.revokeObjectURL(workerUrlRef.current);
-                workerUrlRef.current = null;
-            }
-            pendingJobsRef.current.forEach(function(job) {
-                job.reject(new Error("Worker terminated"));
-            });
-            pendingJobsRef.current.clear();
-            isReadyRef.current = false;
         };
+        workerRef.current = worker;
+        workerUrlRef.current = url;
     }, [
         fn,
         options === null || options === void 0 ? void 0 : options.debug,
@@ -1039,6 +1051,7 @@ var useWebWorker = function(fn, options) {
     ]);
     var runWorkerBase = useCallback2(function(data, transfer) {
         if (!workerRef.current) {
+            ensureWorker();
             if (options === null || options === void 0 ? void 0 : options.debug) {
                 console.warn("[WebWorker".concat((options === null || options === void 0 ? void 0 : options.name) ? ":" + options.name : "", "] fallback to main thread"));
             }
@@ -1097,11 +1110,24 @@ var useWebWorker = function(fn, options) {
                 reject: reject
             });
             try {
-                if (transfer && transfer.length) {
+                var shouldTransfer = Array.isArray(transfer) ? transfer : [];
+                if (!shouldTransfer.length) {
+                    var maybeArrayBuffer = _instanceof(data === null || data === void 0 ? void 0 : data.buffer, ArrayBuffer) ? data.buffer : void 0;
+                    if (maybeArrayBuffer) {
+                        workerRef.current.postMessage({
+                            id: id,
+                            payload: data
+                        }, [
+                            maybeArrayBuffer
+                        ]);
+                        return;
+                    }
+                }
+                if (shouldTransfer.length) {
                     workerRef.current.postMessage({
                         id: id,
                         payload: data
-                    }, transfer);
+                    }, shouldTransfer);
                 } else {
                     workerRef.current.postMessage({
                         id: id,
@@ -1121,7 +1147,8 @@ var useWebWorker = function(fn, options) {
         fn,
         options === null || options === void 0 ? void 0 : options.debug,
         options === null || options === void 0 ? void 0 : options.name,
-        options === null || options === void 0 ? void 0 : options.onError
+        options === null || options === void 0 ? void 0 : options.onError,
+        ensureWorker
     ]);
     var runWorker = runWorkerBase;
     runWorker.isSupported = function() {
@@ -1136,18 +1163,89 @@ var useWebWorker = function(fn, options) {
     runWorker.lastError = function() {
         return lastErrorRef.current;
     };
+    runWorker.terminate = function() {
+        if (workerRef.current) {
+            try {
+                workerRef.current.terminate();
+            } catch (error) {
+                console.error("Error terminating worker", error);
+            }
+            workerRef.current = null;
+        }
+        if (workerUrlRef.current) {
+            try {
+                URL.revokeObjectURL(workerUrlRef.current);
+            } catch (error) {
+                console.error("Error revoking worker URL", error);
+            }
+            workerUrlRef.current = null;
+        }
+        pendingJobsRef.current.forEach(function(job) {
+            return job.reject(new Error("Worker terminated"));
+        });
+        pendingJobsRef.current.clear();
+        isReadyRef.current = false;
+    };
     return runWorker;
 };
-var WebWorker_default = useWebWorker;
 // src/hooks/snapshots.ts
-import { useEffect as useEffect4, useMemo as useMemo3, useRef as useRef4, useState as useState2 } from "react";
+import { useCallback as useCallback3, useEffect as useEffect4, useMemo as useMemo3, useRef as useRef4, useState as useState2 } from "react";
 // src/hooks/snapshotWorker.ts
-var wrapConfigsWithWorker = function(cfgs, runProcessor) {
+var wrapConfigsWithWorker = function(cfgs, runProcessor, options) {
+    var recentEvents = /* @__PURE__ */ new Map();
+    var _options_eventTtlMs;
+    var EVENT_TTL_MS = (_options_eventTtlMs = options === null || options === void 0 ? void 0 : options.eventTtlMs) !== null && _options_eventTtlMs !== void 0 ? _options_eventTtlMs : 1500;
+    var _options_maxRecentEvents;
+    var MAX_RECENT = (_options_maxRecentEvents = options === null || options === void 0 ? void 0 : options.maxRecentEvents) !== null && _options_maxRecentEvents !== void 0 ? _options_maxRecentEvents : 500;
+    var now = function() {
+        return Date.now();
+    };
+    var makeKey = function(op, docs, collectionName) {
+        try {
+            var ids = (docs || []).map(function(d) {
+                return d === null || d === void 0 ? void 0 : d.id;
+            }).filter(Boolean).sort().join(",");
+            return "".concat(collectionName || "unknown", ":").concat(op, ":").concat(ids);
+        } catch (e) {
+            return "".concat(collectionName || "unknown", ":").concat(op, ":*");
+        }
+    };
+    var shouldProcess = function(key) {
+        var ts = recentEvents.get(key);
+        if (ts && now() - ts < EVENT_TTL_MS) {
+            return false;
+        }
+        if (recentEvents.size > MAX_RECENT) {
+            var cutoff = now() - EVENT_TTL_MS;
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                for(var _iterator = Array.from(recentEvents.entries())[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var _step_value = _sliced_to_array(_step.value, 2), k = _step_value[0], v = _step_value[1];
+                    if (v < cutoff) recentEvents.delete(k);
+                }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
+        }
+        recentEvents.set(key, now());
+        return true;
+    };
     var wrapCb = function(cb, op, run) {
         if (!cb) return void 0;
         return /*#__PURE__*/ function() {
             var _ref = _async_to_generator(function(docs, config) {
-                var safeDocs, _ref, processed, e;
+                var key, safeDocs, _ref, processed, e;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -1157,7 +1255,13 @@ var wrapConfigsWithWorker = function(cfgs, runProcessor) {
                                 ,
                                 3
                             ]);
-                            safeDocs = JSON.parse(JSON.stringify(docs));
+                            key = makeKey(op, docs, config === null || config === void 0 ? void 0 : config.collectionName);
+                            if (!shouldProcess(key)) {
+                                return [
+                                    2
+                                ];
+                            }
+                            safeDocs = (options === null || options === void 0 ? void 0 : options.jsonClone) === false ? docs : JSON.parse(JSON.stringify(docs));
                             return [
                                 4,
                                 run({
@@ -1214,11 +1318,13 @@ var wrapConfigsWithWorker = function(cfgs, runProcessor) {
 var useDbSnapshots = function(configs, label, settings) {
     var snapshotsFirstTime = useRef4([]);
     var unsubscribeFunctions = useRef4([]);
-    var runProcessor = WebWorker_default(function(payload) {
+    var lastDbCollectionsRef = useRef4([]);
+    var workerProcessorDb = useCallback3(function(payload) {
         return {
             docs: payload.docs
         };
-    }, settings === null || settings === void 0 ? void 0 : settings.worker);
+    }, []);
+    var runProcessor = useWebWorker(workerProcessorDb, settings === null || settings === void 0 ? void 0 : settings.worker);
     var wrapConfigsForWorker = function(cfgs) {
         return wrapConfigsWithWorker(cfgs, function(payload) {
             return runProcessor(payload);
@@ -1230,6 +1336,9 @@ var useDbSnapshots = function(configs, label, settings) {
             console.log("==> ".concat(label || "DB snapshots", " started from db... "));
         }
         var wrappedConfigs = wrapConfigsForWorker(configs);
+        lastDbCollectionsRef.current = configs.map(function(c) {
+            return c.collectionName;
+        });
         var snapshotResults = wrappedConfigs.map(function(config) {
             return snapshot(config, snapshotsFirstTime.current, settings);
         });
@@ -1245,11 +1354,15 @@ var useDbSnapshots = function(configs, label, settings) {
         });
         if (settings === null || settings === void 0 ? void 0 : settings.cleanupForConfigChange) {
             return function() {
+                var _settings_worker;
                 unsubscribeFunctions.current.forEach(function(unsubscribe) {
                     if (unsubscribe) {
                         unsubscribe();
                     }
                 });
+                if ((settings === null || settings === void 0 ? void 0 : (_settings_worker = settings.worker) === null || _settings_worker === void 0 ? void 0 : _settings_worker.debug) && lastDbCollectionsRef.current.length) {
+                    console.log("==> ".concat(label || "DB snapshots", " cleanup: cleaned previous subscriptions for [").concat(lastDbCollectionsRef.current.join(", "), "]"));
+                }
                 if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
                     console.log("==> ".concat(label || "DB snapshots", " unsubscribed from db"));
                 }
@@ -1262,11 +1375,15 @@ var useDbSnapshots = function(configs, label, settings) {
     ]);
     useEffect4(function() {
         return function() {
+            var _settings_worker;
             unsubscribeFunctions.current.forEach(function(unsubscribe) {
                 if (unsubscribe) {
                     unsubscribe();
                 }
             });
+            if ((settings === null || settings === void 0 ? void 0 : (_settings_worker = settings.worker) === null || _settings_worker === void 0 ? void 0 : _settings_worker.debug) && lastDbCollectionsRef.current.length) {
+                console.log("==> ".concat(label || "DB snapshots", " cleanup: cleaned previous subscriptions for [").concat(lastDbCollectionsRef.current.join(", "), "]"));
+            }
             if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                 console.log("==> ".concat(label || "DB snapshots", " unsubscribed"));
             }
@@ -1300,6 +1417,10 @@ var useSmartSnapshots = function(configs, label, settings) {
                 configForDb.push(cfg);
             }
         });
+        if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
+            console.log("configForDb", configForDb);
+            console.log("configForCache", configForCache);
+        }
         return {
             configForDb: configForDb,
             configForCache: configForCache
@@ -1318,36 +1439,70 @@ 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);
-    var runProcessor = WebWorker_default(function(payload) {
+    var activeSubscriptionKeyRef = useRef4(null);
+    var activeCollectionsRef = useRef4(/* @__PURE__ */ new Set());
+    var offConnectRef = useRef4(null);
+    var offDisconnectRef = useRef4(null);
+    var workerProcessorSocket = useCallback3(function(payload) {
         return {
             docs: payload.docs
         };
-    }, settings === null || settings === void 0 ? void 0 : settings.worker);
+    }, []);
+    var runProcessor = useWebWorker(workerProcessorSocket, settings === null || settings === void 0 ? void 0 : settings.worker);
     var wrapConfigsForWorker = function(cfgs) {
         return wrapConfigsWithWorker(cfgs, function(payload) {
             return runProcessor(payload);
         });
     };
     useDeepCompareEffect(function() {
+        var _offConnectRef_current, _offDisconnectRef_current;
         if (!auth.currentUser) {
             return;
         }
         var subscribe = function() {
-            if (configs.length === 0) {
+            var desiredNames = new Set(configs.map(function(c) {
+                return c.collectionName;
+            }));
+            var key = JSON.stringify(Array.from(desiredNames).sort());
+            if (settings === null || settings === void 0 ? void 0 : settings.cleanupForConfigChange) {
+                if (activeSubscriptionKeyRef.current === key) return;
+                if (cleanupSubscriptionsRef.current.length) {
+                    cleanupSubscriptionsRef.current.forEach(function(cleanup) {
+                        return cleanup();
+                    });
+                    cleanupSubscriptionsRef.current = [];
+                }
+                if (configs.length === 0) return;
+                var disposer2 = socketServiceInstance.subscribeToCollections(wrapConfigsForWorker(configs));
+                cleanupSubscriptionsRef.current.push(disposer2);
+                activeCollectionsRef.current = new Set(desiredNames);
+                activeSubscriptionKeyRef.current = key;
+                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(", ")));
+                }
+                return;
+            }
+            var toAdd = Array.from(desiredNames).filter(function(name) {
+                return !activeCollectionsRef.current.has(name);
+            });
+            if (toAdd.length === 0) {
                 return;
             }
-            var disposer = socketServiceInstance.subscribeToCollections(wrapConfigsForWorker(configs));
-            setCleanupSubscriptions(function(prev) {
-                return _to_consumable_array(prev).concat([
-                    disposer
-                ]);
+            var configsToAdd = configs.filter(function(c) {
+                return toAdd.includes(c.collectionName);
+            });
+            var disposer = socketServiceInstance.subscribeToCollections(wrapConfigsForWorker(configsToAdd));
+            cleanupSubscriptionsRef.current.push(disposer);
+            toAdd.forEach(function(n) {
+                return activeCollectionsRef.current.add(n);
             });
+            activeSubscriptionKeyRef.current = JSON.stringify(Array.from(activeCollectionsRef.current).sort());
             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(", ")));
+                console.log("==> ".concat(label || "Cache snapshots", " appended subscriptions for ").concat(toAdd.join(", ")));
             }
         };
         if (socketServiceInstance.isConnected()) {
@@ -1360,24 +1515,42 @@ var useSocketSnapshots = function(configs, label, settings) {
                 if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
                     console.log("==> ".concat(label || "Cache snapshots", " started... "));
                 }
+            }).catch(function(err) {
+                socketStarted.current = false;
+                if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs)) {
+                    console.error("==> ".concat(label || "Cache snapshots", " failed to acquire token:"), err);
+                }
             });
         }
-        var offConnect = socketServiceInstance.onConnect(function() {
+        (_offConnectRef_current = offConnectRef.current) === null || _offConnectRef_current === void 0 ? void 0 : _offConnectRef_current.call(offConnectRef);
+        (_offDisconnectRef_current = offDisconnectRef.current) === null || _offDisconnectRef_current === void 0 ? void 0 : _offDisconnectRef_current.call(offDisconnectRef);
+        offConnectRef.current = socketServiceInstance.onConnect(function() {
             setSocketConnected(true);
             socketStarted.current = false;
             subscribe();
         });
-        var offDisconnect = socketServiceInstance.onDisconnect(function() {
+        offDisconnectRef.current = socketServiceInstance.onDisconnect(function() {
             setSocketConnected(false);
-            cleanupSubscriptions.forEach(function(cleanup) {
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
                 return cleanup();
             });
+            cleanupSubscriptionsRef.current = [];
+            activeSubscriptionKeyRef.current = null;
+            activeCollectionsRef.current = /* @__PURE__ */ new Set();
         });
         if (settings === null || settings === void 0 ? void 0 : settings.cleanupForConfigChange) {
             return function() {
-                cleanupSubscriptions.forEach(function(cleanup) {
+                var _offConnectRef_current, _offDisconnectRef_current;
+                cleanupSubscriptionsRef.current.forEach(function(cleanup) {
                     return cleanup();
                 });
+                cleanupSubscriptionsRef.current = [];
+                activeSubscriptionKeyRef.current = null;
+                activeCollectionsRef.current = /* @__PURE__ */ new Set();
+                (_offConnectRef_current = offConnectRef.current) === null || _offConnectRef_current === void 0 ? void 0 : _offConnectRef_current.call(offConnectRef);
+                offConnectRef.current = null;
+                (_offDisconnectRef_current = offDisconnectRef.current) === null || _offDisconnectRef_current === void 0 ? void 0 : _offDisconnectRef_current.call(offDisconnectRef);
+                offDisconnectRef.current = null;
                 if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
                     console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
                 }
@@ -1389,9 +1562,17 @@ var useSocketSnapshots = function(configs, label, settings) {
     ]);
     useEffect4(function() {
         return function() {
-            cleanupSubscriptions.forEach(function(cleanup) {
+            var _offConnectRef_current, _offDisconnectRef_current;
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
                 return cleanup();
             });
+            cleanupSubscriptionsRef.current = [];
+            activeSubscriptionKeyRef.current = null;
+            activeCollectionsRef.current = /* @__PURE__ */ new Set();
+            (_offConnectRef_current = offConnectRef.current) === null || _offConnectRef_current === void 0 ? void 0 : _offConnectRef_current.call(offConnectRef);
+            offConnectRef.current = null;
+            (_offDisconnectRef_current = offDisconnectRef.current) === null || _offDisconnectRef_current === void 0 ? void 0 : _offDisconnectRef_current.call(offDisconnectRef);
+            offDisconnectRef.current = null;
             if (!(settings === null || settings === void 0 ? void 0 : settings.disableLogs) && configs.length > 0) {
                 console.log("==> ".concat(label || "Cache snapshots", " unsubscribed. "));
             }
@@ -1401,5 +1582,5 @@ var useSocketSnapshots = function(configs, label, settings) {
         socketConnected: socketConnected
     };
 };
-export { useDbSnapshots, useDeepCompareEffect, useDeepCompareMemo, useDocumentTitle, useSafeEffect, useSetUserCountry, useSmartSnapshots, useSocketSnapshots };
+export { useDbSnapshots, useDeepCompareEffect, useDeepCompareMemo, useDocumentTitle, useSafeEffect, useSetUserCountry, useSmartSnapshots, useSocketSnapshots, useWebWorker };
 //# sourceMappingURL=index.mjs.map

package/package.json

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