akeyless-client-commons 1.1.129 → 1.1.131

package/dist/hooks/index.mjs

@@ -7,6 +7,9 @@ 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);
@@ -75,6 +78,9 @@ 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;
@@ -102,6 +108,9 @@ 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] : {};
@@ -154,6 +163,9 @@ function _tagged_template_literal(strings, raw) {
         }
     }));
 }
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -330,6 +342,93 @@ import { ref, getDownloadURL, uploadBytes } from "firebase/storage";
 // src/helpers/time_helpers.ts
 import { Timestamp } from "firebase/firestore";
 import moment from "moment-timezone";
+// src/helpers/global.ts
+import { CountryOptions, LanguageOptions } from "akeyless-types-commons";
+import axios from "axios";
+import { isEqual } from "lodash";
+var getUserCountryByIp = /*#__PURE__*/ function() {
+    var _ref = _async_to_generator(function() {
+        var response, data, error;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    _state.trys.push([
+                        0,
+                        3,
+                        ,
+                        4
+                    ]);
+                    return [
+                        4,
+                        fetch("https://ipapi.co/json/")
+                    ];
+                case 1:
+                    response = _state.sent();
+                    return [
+                        4,
+                        response.json()
+                    ];
+                case 2:
+                    data = _state.sent();
+                    return [
+                        2,
+                        (data.country_code || CountryOptions.IL).toLowerCase()
+                    ];
+                case 3:
+                    error = _state.sent();
+                    console.error("Error fetching Country:", error);
+                    return [
+                        2,
+                        CountryOptions.IL
+                    ];
+                case 4:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function getUserCountryByIp() {
+        return _ref.apply(this, arguments);
+    };
+}();
+var isNodeEnv = typeof process !== "undefined" && process.env;
+var _ref = {
+    mode: isNodeEnv ? process.env.NEXT_PUBLIC_MODE : import.meta.env.VITE_MODE,
+    isLocal: (isNodeEnv ? process.env.NEXT_PUBLIC_IS_LOCAL : import.meta.env.VITE_is_local) === "true"
+}, mode = _ref.mode, isLocal = _ref.isLocal;
+var checkConditions = function(document2, conditions) {
+    if (!conditions || conditions.length === 0) return true;
+    return conditions.every(function(condition) {
+        var fieldValue = document2[condition.field_name];
+        switch(condition.operator){
+            case "==":
+                return fieldValue === condition.value;
+            case "!=":
+                return fieldValue !== condition.value;
+            case "<":
+                return fieldValue < condition.value;
+            case "<=":
+                return fieldValue <= condition.value;
+            case ">":
+                return fieldValue > condition.value;
+            case ">=":
+                return fieldValue >= condition.value;
+            case "in":
+                return Array.isArray(condition.value) && condition.value.includes(fieldValue);
+            case "not-in":
+                return Array.isArray(condition.value) && !condition.value.includes(fieldValue);
+            case "array-contains":
+                return Array.isArray(fieldValue) && fieldValue.includes(condition.value);
+            case "array-contains-any":
+                return Array.isArray(fieldValue) && Array.isArray(condition.value) && condition.value.some(function(v) {
+                    return fieldValue.includes(v);
+                });
+            default:
+                return false;
+        }
+    });
+};
 // src/helpers/firebase.ts
 var initApp = function() {
     var isNodeEnv2 = typeof process !== "undefined" && process.env;
@@ -592,85 +691,6 @@ var snapshotDocument = function(config, snapshotsFirstTime) {
         unsubscribe: unsubscribe
     };
 };
-var checkConditions = function(document2, conditions) {
-    if (!conditions || conditions.length === 0) return true;
-    return conditions.every(function(condition) {
-        var fieldValue = document2[condition.field_name];
-        switch(condition.operator){
-            case "==":
-                return fieldValue === condition.value;
-            case "!=":
-                return fieldValue !== condition.value;
-            case "<":
-                return fieldValue < condition.value;
-            case "<=":
-                return fieldValue <= condition.value;
-            case ">":
-                return fieldValue > condition.value;
-            case ">=":
-                return fieldValue >= condition.value;
-            case "array-contains":
-                return Array.isArray(fieldValue) && fieldValue.includes(condition.value);
-            default:
-                return false;
-        }
-    });
-};
-// src/helpers/global.ts
-import { CountryOptions, LanguageOptions } from "akeyless-types-commons";
-import axios from "axios";
-import { isEqual } from "lodash";
-var getUserCountryByIp = /*#__PURE__*/ function() {
-    var _ref = _async_to_generator(function() {
-        var response, data, error;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    _state.trys.push([
-                        0,
-                        3,
-                        ,
-                        4
-                    ]);
-                    return [
-                        4,
-                        fetch("https://ipapi.co/json/")
-                    ];
-                case 1:
-                    response = _state.sent();
-                    return [
-                        4,
-                        response.json()
-                    ];
-                case 2:
-                    data = _state.sent();
-                    return [
-                        2,
-                        (data.country_code || CountryOptions.IL).toLowerCase()
-                    ];
-                case 3:
-                    error = _state.sent();
-                    console.error("Error fetching Country:", error);
-                    return [
-                        2,
-                        CountryOptions.IL
-                    ];
-                case 4:
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return function getUserCountryByIp() {
-        return _ref.apply(this, arguments);
-    };
-}();
-var isNodeEnv = typeof process !== "undefined" && process.env;
-var _ref = {
-    mode: isNodeEnv ? process.env.NEXT_PUBLIC_MODE : import.meta.env.VITE_MODE,
-    isLocal: (isNodeEnv ? process.env.NEXT_PUBLIC_IS_LOCAL : import.meta.env.VITE_is_local) === "true"
-}, mode = _ref.mode, isLocal = _ref.isLocal;
 // src/helpers/forms.ts
 import XRegExp from "xregexp";
 var textRegex = XRegExp(String.raw(_templateObject()), "gu");
@@ -713,6 +733,9 @@ var SocketService = /*#__PURE__*/ function() {
         this.disconnectCallbacks = [];
         this.authToken = null;
         this.isDisconnected = true;
+        /// the data-socket keeps one subscription per collection per socket, so a second condition set
+        /// for a collection never reaches it and would silently receive the first one's documents
+        this.activeConditions = /* @__PURE__ */ new Map();
         this.handleDisconnect = function(source, reason) {
             var _this_socket;
             if (_this.isDisconnected) {
@@ -880,6 +903,39 @@ var SocketService = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "registerConditions",
+            value: function registerConditions(collectionName) {
+                var conditions = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
+                var signature = JSON.stringify(conditions);
+                var active = this.activeConditions.get(collectionName);
+                if (!active) {
+                    this.activeConditions.set(collectionName, {
+                        signature: signature,
+                        conditions: conditions,
+                        count: 1
+                    });
+                    return;
+                }
+                active.count++;
+                if (active.signature !== signature) {
+                    console.error('[socket] "'.concat(collectionName, '" is already subscribed with different conditions, and a collection supports one condition set at a time. The active set stays in effect, so this subscription receives its documents instead of its own. active: ').concat(active.signature, " requested: ").concat(signature));
+                }
+            }
+        },
+        {
+            key: "releaseConditions",
+            value: function releaseConditions(collectionName) {
+                var active = this.activeConditions.get(collectionName);
+                if (!active) {
+                    return;
+                }
+                active.count--;
+                if (active.count <= 0) {
+                    this.activeConditions.delete(collectionName);
+                }
+            }
+        },
         {
             key: "disconnectSocket",
             value: function disconnectSocket() {
@@ -891,6 +947,8 @@ var SocketService = /*#__PURE__*/ function() {
         },
         {
             /// subscribe to collections
+            /// conditions are derived from OnSnapshotConfig.conditions, never passed in, so a caller cannot
+            /// set them in a second place and have them silently overwritten
             key: "subscribeToCollections",
             value: function subscribeToCollections(config, options) {
                 var _this = this;
@@ -903,26 +961,77 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
+                    var collectionName = configuration.collectionName, conditions = configuration.conditions;
+                    var parsers = [
+                        configuration
+                    ].concat(_to_consumable_array(configuration.extraParsers || []));
+                    var matchedIds = /* @__PURE__ */ new Set();
                     var attach = function(eventName, handler) {
-                        if (!handler) return;
-                        _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({
                             eventName: eventName,
                             handler: handler
                         });
                     };
-                    attach("initial:".concat(collectionName), onFirstTime);
-                    attach("add:".concat(collectionName), onAdd);
-                    attach("update:".concat(collectionName), onModify);
-                    attach("delete:".concat(collectionName), onRemove);
-                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
-                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
-                        attach("initial:".concat(collectionName), extraOnFirstTime);
-                        attach("add:".concat(collectionName), extraOnAdd);
-                        attach("update:".concat(collectionName), extraOnModify);
-                        attach("delete:".concat(collectionName), extraOnRemove);
+                    var toDocs = function(payload) {
+                        return Array.isArray(payload) ? payload : payload ? [
+                            payload
+                        ] : [];
+                    };
+                    var run = function(op, docs) {
+                        return parsers.forEach(function(parser) {
+                            var _parser_op;
+                            return (_parser_op = parser[op]) === null || _parser_op === void 0 ? void 0 : _parser_op.call(parser, docs, configuration);
+                        });
+                    };
+                    var runIfAny = function(op, docs) {
+                        if (docs.length) {
+                            run(op, docs);
+                        }
+                    };
+                    attach("initial:".concat(collectionName), function(payload) {
+                        var docs = toDocs(payload).filter(function(doc2) {
+                            return checkConditions(doc2, conditions);
+                        });
+                        matchedIds.clear();
+                        docs.forEach(function(doc2) {
+                            return matchedIds.add(doc2.id);
+                        });
+                        run("onFirstTime", docs);
+                    });
+                    var handleUpsert = function(payload, defaultOp) {
+                        var added = [];
+                        var modified = [];
+                        var removed = [];
+                        toDocs(payload).forEach(function(doc2) {
+                            if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) {
+                                (defaultOp === "onAdd" ? added : modified).push(doc2);
+                                return;
+                            }
+                            var wasMatching = matchedIds.has(doc2.id);
+                            if (checkConditions(doc2, conditions)) {
+                                matchedIds.add(doc2.id);
+                                (wasMatching ? modified : added).push(doc2);
+                            } else if (wasMatching) {
+                                matchedIds.delete(doc2.id);
+                                removed.push(doc2);
+                            }
+                        });
+                        runIfAny("onAdd", added);
+                        runIfAny("onModify", modified);
+                        runIfAny("onRemove", removed);
+                    };
+                    attach("add:".concat(collectionName), function(payload) {
+                        return handleUpsert(payload, "onAdd");
+                    });
+                    attach("update:".concat(collectionName), function(payload) {
+                        return handleUpsert(payload, "onModify");
+                    });
+                    attach("delete:".concat(collectionName), function(payload) {
+                        var docs = toDocs(payload).filter(function(doc2) {
+                            return !(conditions === null || conditions === void 0 ? void 0 : conditions.length) || matchedIds.delete(doc2.id);
+                        });
+                        runIfAny("onRemove", docs);
                     });
                 });
                 var acknowledge = function(callback) {
@@ -932,12 +1041,28 @@ var SocketService = /*#__PURE__*/ function() {
                         console.error("Failed to subscribe to ".concat(config.join(", "), ": ").concat(callback.message));
                     }
                 };
-                if (options) {
-                    s.emit("subscribe_options", options);
+                config.forEach(function(c) {
+                    return _this.registerConditions(c.collectionName, c.conditions);
+                });
+                var conditionsByCollection = config.reduce(function(acc, c) {
+                    var active = _this.activeConditions.get(c.collectionName);
+                    if (active === null || active === void 0 ? void 0 : active.conditions.length) {
+                        acc[c.collectionName] = active.conditions;
+                    }
+                    return acc;
+                }, {});
+                var subscribeOptions = Object.keys(conditionsByCollection).length ? _object_spread_props(_object_spread({}, options), {
+                    conditions: conditionsByCollection
+                }) : options;
+                if (subscribeOptions) {
+                    s.emit("subscribe_options", subscribeOptions);
                 }
                 s.emit("subscribe_collections", collectionsNames, acknowledge);
                 return function() {
                     console.log("Cleaning up subscriptions for: ".concat(collectionsNames.join(", ")));
+                    collectionsNames.forEach(function(name) {
+                        return _this.releaseConditions(name);
+                    });
                     s.emit("unsubscribe_collections", collectionsNames);
                     eventHandlers.forEach(function(eh) {
                         s.off(eh.eventName, eh.handler);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "akeyless-client-commons",
-    "version": "1.1.129",
+    "version": "1.1.131",
     "scripts": {
         "build": "tsup",
         "deploy": "npm run build && npm version patch --no-git-tag-version && npm publish",
@@ -18,7 +18,7 @@
         "@radix-ui/react-progress": "^1.1.1",
         "@radix-ui/react-slot": "^1.1.2",
         "@types/lodash": "^4.17.13",
-        "akeyless-types-commons": "^1.0.86",
+        "akeyless-types-commons": "^1.0.128",
         "assets": "^3.0.1",
         "axios": "^1.7.9",
         "class-variance-authority": "^0.7.0",