npm - akeyless-client-commons - Versions diffs - 1.1.37 → 1.1.39 - Mend

akeyless-client-commons 1.1.37 → 1.1.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/components/index.js +18 -13
package/dist/components/index.mjs +18 -13
package/dist/helpers/index.js +18 -13
package/dist/helpers/index.mjs +18 -13
package/dist/hooks/index.d.mts +11 -1
package/dist/hooks/index.d.ts +11 -1
package/dist/hooks/index.js +252 -59
package/dist/hooks/index.mjs +248 -59
package/package.json +1 -1

package/dist/components/index.js CHANGED Viewed

@@ -1157,32 +1157,37 @@ function cn() {
 var import_firestore2 = require("firebase/firestore");
 var import_moment_timezone = __toESM(require("moment-timezone"));
 function timestamp_to_string(firebaseTimestamp, options) {
+    var _options_defaultReturnedValue, _options_format, _options_fromFormat;
+    var _ref = {
+        defaultReturnedValue: (_options_defaultReturnedValue = options === null || options === void 0 ? void 0 : options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-",
+        format: (_options_format = options === null || options === void 0 ? void 0 : options.format) !== null && _options_format !== void 0 ? _options_format : "DD/MM/YYYY HH:mm:ss",
+        fromFormat: (_options_fromFormat = options === null || options === void 0 ? void 0 : options.fromFormat) !== null && _options_fromFormat !== void 0 ? _options_fromFormat : "DD/MM/YYYY HH:mm:ss",
+        tz: options === null || options === void 0 ? void 0 : options.tz
+    }, defaultReturnedValue = _ref.defaultReturnedValue, format = _ref.format, fromFormat = _ref.fromFormat, tz = _ref.tz;
     if (!firebaseTimestamp) {
-        var _options_defaultReturnedValue;
-        return (_options_defaultReturnedValue = options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-";
+        return defaultReturnedValue;
     }
     var date;
     if (_instanceof(firebaseTimestamp, import_firestore2.Timestamp)) {
         date = firebaseTimestamp.toDate();
     } else if (_instanceof(firebaseTimestamp, Date)) {
         date = firebaseTimestamp;
-    } else if (firebaseTimestamp._seconds && firebaseTimestamp._nanoseconds) {
-        date = new Date(firebaseTimestamp._seconds * 1e3 + firebaseTimestamp._nanoseconds / 1e6);
     } else if (typeof firebaseTimestamp === "string") {
-        date = import_moment_timezone.default.utc(firebaseTimestamp, (options === null || options === void 0 ? void 0 : options.fromFormat) || "DD/MM/YYYY HH:mm:ss").toDate();
+        date = import_moment_timezone.default.utc(firebaseTimestamp, fromFormat).toDate();
         if (isNaN(date.getTime())) {
-            var _options_defaultReturnedValue1;
-            return (_options_defaultReturnedValue1 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue1 !== void 0 ? _options_defaultReturnedValue1 : "-";
+            return defaultReturnedValue;
         }
+    } else if (firebaseTimestamp._seconds) {
+        var _firebaseTimestamp__nanoseconds;
+        date = new Date(firebaseTimestamp._seconds * 1e3 + ((_firebaseTimestamp__nanoseconds = firebaseTimestamp._nanoseconds) !== null && _firebaseTimestamp__nanoseconds !== void 0 ? _firebaseTimestamp__nanoseconds : 0) / 1e6);
     } else {
-        var _options_defaultReturnedValue2;
-        return (_options_defaultReturnedValue2 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue2 !== void 0 ? _options_defaultReturnedValue2 : "-";
+        console.error("Invalid timestamp format: ", firebaseTimestamp);
+        return defaultReturnedValue;
     }
-    if (options === null || options === void 0 ? void 0 : options.tz) {
-        var result = (0, import_moment_timezone.default)(date).tz(options === null || options === void 0 ? void 0 : options.tz).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
-        return result;
+    if (tz) {
+        return (0, import_moment_timezone.default)(date).tz(tz).format(format);
     }
-    return import_moment_timezone.default.utc(date).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
+    return import_moment_timezone.default.utc(date).format(format);
 }
 // src/helpers/api.ts
 var import_axios2 = __toESM(require("axios"));

package/dist/components/index.mjs CHANGED Viewed

@@ -935,32 +935,37 @@ function cn() {
 import { Timestamp as Timestamp2 } from "firebase/firestore";
 import moment2 from "moment-timezone";
 function timestamp_to_string(firebaseTimestamp, options) {
+    var _options_defaultReturnedValue, _options_format, _options_fromFormat;
+    var _ref = {
+        defaultReturnedValue: (_options_defaultReturnedValue = options === null || options === void 0 ? void 0 : options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-",
+        format: (_options_format = options === null || options === void 0 ? void 0 : options.format) !== null && _options_format !== void 0 ? _options_format : "DD/MM/YYYY HH:mm:ss",
+        fromFormat: (_options_fromFormat = options === null || options === void 0 ? void 0 : options.fromFormat) !== null && _options_fromFormat !== void 0 ? _options_fromFormat : "DD/MM/YYYY HH:mm:ss",
+        tz: options === null || options === void 0 ? void 0 : options.tz
+    }, defaultReturnedValue = _ref.defaultReturnedValue, format = _ref.format, fromFormat = _ref.fromFormat, tz = _ref.tz;
     if (!firebaseTimestamp) {
-        var _options_defaultReturnedValue;
-        return (_options_defaultReturnedValue = options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-";
+        return defaultReturnedValue;
     }
     var date;
     if (_instanceof(firebaseTimestamp, Timestamp2)) {
         date = firebaseTimestamp.toDate();
     } else if (_instanceof(firebaseTimestamp, Date)) {
         date = firebaseTimestamp;
-    } else if (firebaseTimestamp._seconds && firebaseTimestamp._nanoseconds) {
-        date = new Date(firebaseTimestamp._seconds * 1e3 + firebaseTimestamp._nanoseconds / 1e6);
     } else if (typeof firebaseTimestamp === "string") {
-        date = moment2.utc(firebaseTimestamp, (options === null || options === void 0 ? void 0 : options.fromFormat) || "DD/MM/YYYY HH:mm:ss").toDate();
+        date = moment2.utc(firebaseTimestamp, fromFormat).toDate();
         if (isNaN(date.getTime())) {
-            var _options_defaultReturnedValue1;
-            return (_options_defaultReturnedValue1 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue1 !== void 0 ? _options_defaultReturnedValue1 : "-";
+            return defaultReturnedValue;
         }
+    } else if (firebaseTimestamp._seconds) {
+        var _firebaseTimestamp__nanoseconds;
+        date = new Date(firebaseTimestamp._seconds * 1e3 + ((_firebaseTimestamp__nanoseconds = firebaseTimestamp._nanoseconds) !== null && _firebaseTimestamp__nanoseconds !== void 0 ? _firebaseTimestamp__nanoseconds : 0) / 1e6);
     } else {
-        var _options_defaultReturnedValue2;
-        return (_options_defaultReturnedValue2 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue2 !== void 0 ? _options_defaultReturnedValue2 : "-";
+        console.error("Invalid timestamp format: ", firebaseTimestamp);
+        return defaultReturnedValue;
     }
-    if (options === null || options === void 0 ? void 0 : options.tz) {
-        var result = moment2(date).tz(options === null || options === void 0 ? void 0 : options.tz).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
-        return result;
+    if (tz) {
+        return moment2(date).tz(tz).format(format);
     }
-    return moment2.utc(date).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
+    return moment2.utc(date).format(format);
 }
 // src/helpers/api.ts
 import axios2 from "axios";

package/dist/helpers/index.js CHANGED Viewed

@@ -2335,32 +2335,37 @@ function cn() {
 var import_firestore2 = require("firebase/firestore");
 var import_moment_timezone = __toESM(require("moment-timezone"));
 function timestamp_to_string(firebaseTimestamp, options) {
+    var _options_defaultReturnedValue, _options_format, _options_fromFormat;
+    var _ref = {
+        defaultReturnedValue: (_options_defaultReturnedValue = options === null || options === void 0 ? void 0 : options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-",
+        format: (_options_format = options === null || options === void 0 ? void 0 : options.format) !== null && _options_format !== void 0 ? _options_format : "DD/MM/YYYY HH:mm:ss",
+        fromFormat: (_options_fromFormat = options === null || options === void 0 ? void 0 : options.fromFormat) !== null && _options_fromFormat !== void 0 ? _options_fromFormat : "DD/MM/YYYY HH:mm:ss",
+        tz: options === null || options === void 0 ? void 0 : options.tz
+    }, defaultReturnedValue = _ref.defaultReturnedValue, format = _ref.format, fromFormat = _ref.fromFormat, tz = _ref.tz;
     if (!firebaseTimestamp) {
-        var _options_defaultReturnedValue;
-        return (_options_defaultReturnedValue = options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-";
+        return defaultReturnedValue;
     }
     var date;
     if (_instanceof(firebaseTimestamp, import_firestore2.Timestamp)) {
         date = firebaseTimestamp.toDate();
     } else if (_instanceof(firebaseTimestamp, Date)) {
         date = firebaseTimestamp;
-    } else if (firebaseTimestamp._seconds && firebaseTimestamp._nanoseconds) {
-        date = new Date(firebaseTimestamp._seconds * 1e3 + firebaseTimestamp._nanoseconds / 1e6);
     } else if (typeof firebaseTimestamp === "string") {
-        date = import_moment_timezone.default.utc(firebaseTimestamp, (options === null || options === void 0 ? void 0 : options.fromFormat) || "DD/MM/YYYY HH:mm:ss").toDate();
+        date = import_moment_timezone.default.utc(firebaseTimestamp, fromFormat).toDate();
         if (isNaN(date.getTime())) {
-            var _options_defaultReturnedValue1;
-            return (_options_defaultReturnedValue1 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue1 !== void 0 ? _options_defaultReturnedValue1 : "-";
+            return defaultReturnedValue;
         }
+    } else if (firebaseTimestamp._seconds) {
+        var _firebaseTimestamp__nanoseconds;
+        date = new Date(firebaseTimestamp._seconds * 1e3 + ((_firebaseTimestamp__nanoseconds = firebaseTimestamp._nanoseconds) !== null && _firebaseTimestamp__nanoseconds !== void 0 ? _firebaseTimestamp__nanoseconds : 0) / 1e6);
     } else {
-        var _options_defaultReturnedValue2;
-        return (_options_defaultReturnedValue2 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue2 !== void 0 ? _options_defaultReturnedValue2 : "-";
+        console.error("Invalid timestamp format: ", firebaseTimestamp);
+        return defaultReturnedValue;
     }
-    if (options === null || options === void 0 ? void 0 : options.tz) {
-        var result = (0, import_moment_timezone.default)(date).tz(options === null || options === void 0 ? void 0 : options.tz).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
-        return result;
+    if (tz) {
+        return (0, import_moment_timezone.default)(date).tz(tz).format(format);
     }
-    return import_moment_timezone.default.utc(date).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
+    return import_moment_timezone.default.utc(date).format(format);
 }
 function timestamp_to_millis(firebaseTimestamp) {
     if (!firebaseTimestamp) {

package/dist/helpers/index.mjs CHANGED Viewed

@@ -1956,32 +1956,37 @@ function cn() {
 import { Timestamp as Timestamp2 } from "firebase/firestore";
 import moment2 from "moment-timezone";
 function timestamp_to_string(firebaseTimestamp, options) {
+    var _options_defaultReturnedValue, _options_format, _options_fromFormat;
+    var _ref = {
+        defaultReturnedValue: (_options_defaultReturnedValue = options === null || options === void 0 ? void 0 : options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-",
+        format: (_options_format = options === null || options === void 0 ? void 0 : options.format) !== null && _options_format !== void 0 ? _options_format : "DD/MM/YYYY HH:mm:ss",
+        fromFormat: (_options_fromFormat = options === null || options === void 0 ? void 0 : options.fromFormat) !== null && _options_fromFormat !== void 0 ? _options_fromFormat : "DD/MM/YYYY HH:mm:ss",
+        tz: options === null || options === void 0 ? void 0 : options.tz
+    }, defaultReturnedValue = _ref.defaultReturnedValue, format = _ref.format, fromFormat = _ref.fromFormat, tz = _ref.tz;
     if (!firebaseTimestamp) {
-        var _options_defaultReturnedValue;
-        return (_options_defaultReturnedValue = options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : "-";
+        return defaultReturnedValue;
     }
     var date;
     if (_instanceof(firebaseTimestamp, Timestamp2)) {
         date = firebaseTimestamp.toDate();
     } else if (_instanceof(firebaseTimestamp, Date)) {
         date = firebaseTimestamp;
-    } else if (firebaseTimestamp._seconds && firebaseTimestamp._nanoseconds) {
-        date = new Date(firebaseTimestamp._seconds * 1e3 + firebaseTimestamp._nanoseconds / 1e6);
     } else if (typeof firebaseTimestamp === "string") {
-        date = moment2.utc(firebaseTimestamp, (options === null || options === void 0 ? void 0 : options.fromFormat) || "DD/MM/YYYY HH:mm:ss").toDate();
+        date = moment2.utc(firebaseTimestamp, fromFormat).toDate();
         if (isNaN(date.getTime())) {
-            var _options_defaultReturnedValue1;
-            return (_options_defaultReturnedValue1 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue1 !== void 0 ? _options_defaultReturnedValue1 : "-";
+            return defaultReturnedValue;
         }
+    } else if (firebaseTimestamp._seconds) {
+        var _firebaseTimestamp__nanoseconds;
+        date = new Date(firebaseTimestamp._seconds * 1e3 + ((_firebaseTimestamp__nanoseconds = firebaseTimestamp._nanoseconds) !== null && _firebaseTimestamp__nanoseconds !== void 0 ? _firebaseTimestamp__nanoseconds : 0) / 1e6);
     } else {
-        var _options_defaultReturnedValue2;
-        return (_options_defaultReturnedValue2 = options.defaultReturnedValue) !== null && _options_defaultReturnedValue2 !== void 0 ? _options_defaultReturnedValue2 : "-";
+        console.error("Invalid timestamp format: ", firebaseTimestamp);
+        return defaultReturnedValue;
     }
-    if (options === null || options === void 0 ? void 0 : options.tz) {
-        var result = moment2(date).tz(options === null || options === void 0 ? void 0 : options.tz).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
-        return result;
+    if (tz) {
+        return moment2(date).tz(tz).format(format);
     }
-    return moment2.utc(date).format((options === null || options === void 0 ? void 0 : options.format) || "DD/MM/YYYY HH:mm:ss");
+    return moment2.utc(date).format(format);
 }
 function timestamp_to_millis(firebaseTimestamp) {
     if (!firebaseTimestamp) {

package/dist/hooks/index.d.mts CHANGED Viewed

@@ -9,11 +9,21 @@ declare function useSafeEffect(callback: () => void, dependencies: any[], error_
 declare const useDeepCompareMemo: <T>(factory: () => T, dependencies: any[]) => T;
 declare function useDeepCompareEffect(effect: EffectCallback, dependencies: any[]): void;
+type WebWorkerFunction<TInput, TOutput> = (data: TInput) => TOutput | Promise<TOutput>;
 interface UseWebWorkerOptions {
     debug?: boolean;
     name?: string;
     onError?: (error: Error) => void;
+    warmStart?: boolean;
+    recreateOnError?: boolean;
 }
+type RunWorkerFunction<TInput, TOutput> = ((data: TInput, transfer?: Transferable[]) => Promise<TOutput>) & {
+    isSupported: () => boolean;
+    isUsingWorker: () => boolean;
+    pendingJobs: () => number;
+    lastError: () => Error | null;
+};
+declare const useWebWorker: <TInput = unknown, TOutput = unknown>(fn: WebWorkerFunction<TInput, TOutput>, options?: UseWebWorkerOptions) => RunWorkerFunction<TInput, TOutput>;
 type OnSnapshotCallback = (documents: any[], config: OnSnapshotConfig) => void;
 interface OnSnapshotParsers {
@@ -56,4 +66,4 @@ declare const useSocketSnapshots: (configs: OnSnapshotConfig[], label?: string,
     socketConnected: boolean;
 };
-export { type UseWebWorkerOptions, useDbSnapshots, useDeepCompareEffect, useDeepCompareMemo, useDocumentTitle, useSafeEffect, useSetUserCountry, useSmartSnapshots, useSocketSnapshots };
+export { type RunWorkerFunction, type UseWebWorkerOptions, type WebWorkerFunction, useDbSnapshots, useDeepCompareEffect, useDeepCompareMemo, useDocumentTitle, useSafeEffect, useSetUserCountry, useSmartSnapshots, useSocketSnapshots, useWebWorker };

package/dist/hooks/index.d.ts CHANGED Viewed

@@ -9,11 +9,21 @@ declare function useSafeEffect(callback: () => void, dependencies: any[], error_
 declare const useDeepCompareMemo: <T>(factory: () => T, dependencies: any[]) => T;
 declare function useDeepCompareEffect(effect: EffectCallback, dependencies: any[]): void;
+type WebWorkerFunction<TInput, TOutput> = (data: TInput) => TOutput | Promise<TOutput>;
 interface UseWebWorkerOptions {
     debug?: boolean;
     name?: string;
     onError?: (error: Error) => void;
+    warmStart?: boolean;
+    recreateOnError?: boolean;
 }
+type RunWorkerFunction<TInput, TOutput> = ((data: TInput, transfer?: Transferable[]) => Promise<TOutput>) & {
+    isSupported: () => boolean;
+    isUsingWorker: () => boolean;
+    pendingJobs: () => number;
+    lastError: () => Error | null;
+};
+declare const useWebWorker: <TInput = unknown, TOutput = unknown>(fn: WebWorkerFunction<TInput, TOutput>, options?: UseWebWorkerOptions) => RunWorkerFunction<TInput, TOutput>;
 type OnSnapshotCallback = (documents: any[], config: OnSnapshotConfig) => void;
 interface OnSnapshotParsers {
@@ -56,4 +66,4 @@ declare const useSocketSnapshots: (configs: OnSnapshotConfig[], label?: string,
     socketConnected: boolean;
 };
-export { type UseWebWorkerOptions, useDbSnapshots, useDeepCompareEffect, useDeepCompareMemo, useDocumentTitle, useSafeEffect, useSetUserCountry, useSmartSnapshots, useSocketSnapshots };
+export { type RunWorkerFunction, type UseWebWorkerOptions, type WebWorkerFunction, useDbSnapshots, useDeepCompareEffect, useDeepCompareMemo, useDocumentTitle, useSafeEffect, useSetUserCountry, useSmartSnapshots, useSocketSnapshots, useWebWorker };

package/dist/hooks/index.js CHANGED Viewed

@@ -335,6 +335,9 @@ __export(index_exports, {
     },
     useSocketSnapshots: function() {
         return useSocketSnapshots;
+    },
+    useWebWorker: function() {
+        return useWebWorker;
     }
 });
 module.exports = __toCommonJS(index_exports);
@@ -1036,6 +1039,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 = (0, import_react4.useCallback)(function() {
+        if (!isSupportedRef.current) return;
+        if (workerRef.current) return;
         var functionString = fn.toString();
         var workerSource = [
             "const userFn = (".concat(functionString, ");"),
@@ -1089,30 +1123,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,
@@ -1121,6 +1148,7 @@ var useWebWorker = function(fn, options) {
     ]);
     var runWorkerBase = (0, import_react4.useCallback)(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"));
             }
@@ -1179,11 +1207,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,
@@ -1203,7 +1244,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() {
@@ -1218,18 +1260,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
+// src/hooks/snapshots/index.ts
 var import_react5 = require("react");
-// src/hooks/snapshotWorker.ts
-var wrapConfigsWithWorker = function(cfgs, runProcessor) {
+// src/hooks/snapshots/snapshotWorker.ts
+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:
@@ -1239,7 +1352,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({
@@ -1292,16 +1411,17 @@ var wrapConfigsWithWorker = function(cfgs, runProcessor) {
         return wrapped;
     });
 };
-// src/hooks/snapshots.ts
+// src/hooks/snapshots/index.ts
 var useDbSnapshots = function(configs, label, settings) {
     var snapshotsFirstTime = (0, import_react5.useRef)([]);
     var unsubscribeFunctions = (0, import_react5.useRef)([]);
+    var lastDbCollectionsRef = (0, import_react5.useRef)([]);
     var workerProcessorDb = (0, import_react5.useCallback)(function(payload) {
         return {
             docs: payload.docs
         };
     }, []);
-    var runProcessor = WebWorker_default(workerProcessorDb, 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);
@@ -1313,6 +1433,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);
         });
@@ -1328,11 +1451,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"));
                 }
@@ -1345,11 +1472,15 @@ var useDbSnapshots = function(configs, label, settings) {
     ]);
     (0, import_react5.useEffect)(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"));
             }
@@ -1383,6 +1514,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
@@ -1403,40 +1538,68 @@ var useSocketSnapshots = function(configs, label, settings) {
     var _ref = _sliced_to_array((0, import_react5.useState)(socketServiceInstance.isConnected()), 2), socketConnected = _ref[0], setSocketConnected = _ref[1];
     var cleanupSubscriptionsRef = (0, import_react5.useRef)([]);
     var socketStarted = (0, import_react5.useRef)(false);
+    var activeSubscriptionKeyRef = (0, import_react5.useRef)(null);
+    var activeCollectionsRef = (0, import_react5.useRef)(/* @__PURE__ */ new Set());
+    var offConnectRef = (0, import_react5.useRef)(null);
+    var offDisconnectRef = (0, import_react5.useRef)(null);
     var workerProcessorSocket = (0, import_react5.useCallback)(function(payload) {
         return {
             docs: payload.docs
         };
     }, []);
-    var runProcessor = WebWorker_default(workerProcessorSocket, 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 clearSubscriptions = function() {
-            if (cleanupSubscriptionsRef.current.length) {
-                cleanupSubscriptionsRef.current.forEach(function(cleanup) {
-                    return cleanup();
-                });
-                cleanupSubscriptionsRef.current = [];
-            }
-        };
         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;
             }
-            clearSubscriptions();
-            var disposer = socketServiceInstance.subscribeToCollections(wrapConfigsForWorker(configs));
+            var toAdd = Array.from(desiredNames).filter(function(name) {
+                return !activeCollectionsRef.current.has(name);
+            });
+            if (toAdd.length === 0) {
+                return;
+            }
+            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()) {
@@ -1449,35 +1612,64 @@ 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);
-            clearSubscriptions();
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
+                return cleanup();
+            });
+            cleanupSubscriptionsRef.current = [];
+            activeSubscriptionKeyRef.current = null;
+            activeCollectionsRef.current = /* @__PURE__ */ new Set();
         });
-        return function() {
-            clearSubscriptions();
-            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() {
+                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. "));
+                }
+            };
+        }
     }, [
         configs,
         (_auth_currentUser = auth.currentUser) === null || _auth_currentUser === void 0 ? void 0 : _auth_currentUser.uid
     ]);
     (0, import_react5.useEffect)(function() {
         return function() {
+            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. "));
             }
@@ -1496,6 +1688,7 @@ var useSocketSnapshots = function(configs, label, settings) {
     useSafeEffect: useSafeEffect,
     useSetUserCountry: useSetUserCountry,
     useSmartSnapshots: useSmartSnapshots,
-    useSocketSnapshots: useSocketSnapshots
+    useSocketSnapshots: useSocketSnapshots,
+    useWebWorker: useWebWorker
 });
 //# sourceMappingURL=index.js.map

package/dist/hooks/index.mjs CHANGED Viewed

@@ -942,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, ");"),
@@ -995,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,
@@ -1027,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"));
             }
@@ -1085,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,
@@ -1109,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() {
@@ -1124,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
+// src/hooks/snapshots/index.ts
 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) {
+// src/hooks/snapshots/snapshotWorker.ts
+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:
@@ -1145,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({
@@ -1198,16 +1314,17 @@ var wrapConfigsWithWorker = function(cfgs, runProcessor) {
         return wrapped;
     });
 };
-// src/hooks/snapshots.ts
+// src/hooks/snapshots/index.ts
 var useDbSnapshots = function(configs, label, settings) {
     var snapshotsFirstTime = useRef4([]);
     var unsubscribeFunctions = useRef4([]);
+    var lastDbCollectionsRef = useRef4([]);
     var workerProcessorDb = useCallback3(function(payload) {
         return {
             docs: payload.docs
         };
     }, []);
-    var runProcessor = WebWorker_default(workerProcessorDb, 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);
@@ -1219,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);
         });
@@ -1234,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"));
                 }
@@ -1251,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"));
             }
@@ -1289,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
@@ -1309,40 +1441,68 @@ var useSocketSnapshots = function(configs, label, settings) {
     var _useState2 = _sliced_to_array(useState2(socketServiceInstance.isConnected()), 2), socketConnected = _useState2[0], setSocketConnected = _useState2[1];
     var cleanupSubscriptionsRef = useRef4([]);
     var socketStarted = useRef4(false);
+    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
         };
     }, []);
-    var runProcessor = WebWorker_default(workerProcessorSocket, 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 clearSubscriptions = function() {
-            if (cleanupSubscriptionsRef.current.length) {
-                cleanupSubscriptionsRef.current.forEach(function(cleanup) {
-                    return cleanup();
-                });
-                cleanupSubscriptionsRef.current = [];
-            }
-        };
         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;
             }
-            clearSubscriptions();
-            var disposer = socketServiceInstance.subscribeToCollections(wrapConfigsForWorker(configs));
+            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()) {
@@ -1355,35 +1515,64 @@ 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);
-            clearSubscriptions();
+            cleanupSubscriptionsRef.current.forEach(function(cleanup) {
+                return cleanup();
+            });
+            cleanupSubscriptionsRef.current = [];
+            activeSubscriptionKeyRef.current = null;
+            activeCollectionsRef.current = /* @__PURE__ */ new Set();
         });
-        return function() {
-            clearSubscriptions();
-            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() {
+                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. "));
+                }
+            };
+        }
     }, [
         configs,
         (_auth_currentUser = auth.currentUser) === null || _auth_currentUser === void 0 ? void 0 : _auth_currentUser.uid
     ]);
     useEffect4(function() {
         return function() {
+            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. "));
             }
@@ -1393,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 CHANGED Viewed

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