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

package/dist/components/index.js

@@ -1193,6 +1193,7 @@ var dataSocketDomain = isLocal ? "http://localhost:9009/api/data-socket" : baseD
 var dataSyncDomain = isLocal ? "http://localhost:9010/api/data-sync" : baseDomain + "/data-sync";
 // src/helpers/socket.ts
 var import_socket = require("socket.io-client");
+var SESSION_STORAGE_KEY = "sessionId";
 var SocketService = /*#__PURE__*/ function() {
     "use strict";
     function _SocketService() {
@@ -1212,19 +1213,24 @@ var SocketService = /*#__PURE__*/ function() {
                     var socketUrl = isLocal ? "http://localhost:9009" : mode === "qa" ? "https://nx-api.xyz" : "https://nx-api.info";
                     this.socket = (0, import_socket.io)(socketUrl, {
                         path: "/api/data-socket/connect",
-                        transports: [
-                            "websocket"
-                        ],
-                        auth: this.authToken ? {
-                            token: this.authToken
-                        } : void 0
+                        auth: function(cb) {
+                            var sessionId = localStorage.getItem(SESSION_STORAGE_KEY) || void 0;
+                            var token = _this.authToken;
+                            var authPayload = {};
+                            if (token) authPayload.token = token;
+                            if (sessionId) authPayload.sessionId = sessionId;
+                            cb(authPayload);
+                        },
+                        reconnection: true,
+                        reconnectionAttempts: 30,
+                        reconnectionDelay: 2 * 1e3
                     });
                     this.socket.on("connect", function() {
-                        var _this_socket;
-                        console.log("Socket connected:", (_this_socket = _this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.id);
-                    });
-                    this.connectCallbacks.forEach(function(cb) {
-                        return cb();
+                        var _this_socket, _this_socket1;
+                        console.log("\uD83D\uDFE2 Socket connected: ".concat((_this_socket = _this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.id, " (recovered - ").concat((_this_socket1 = _this.socket) === null || _this_socket1 === void 0 ? void 0 : _this_socket1.recovered, ")"));
+                        _this.connectCallbacks.forEach(function(cb) {
+                            return cb();
+                        });
                     });
                     this.socket.on("disconnect", function(reason) {
                         console.log("Socket disconnected:", reason);
@@ -1232,6 +1238,12 @@ var SocketService = /*#__PURE__*/ function() {
                             return cb();
                         });
                     });
+                    this.socket.on("session", function(param) {
+                        var sessionId = param.sessionId;
+                        if (sessionId) {
+                            localStorage.setItem(SESSION_STORAGE_KEY, sessionId);
+                        }
+                    });
                     this.socket.on("connect_error", function(error) {
                         console.error("Socket connection error:", error);
                     });
@@ -1254,10 +1266,90 @@ var SocketService = /*#__PURE__*/ function() {
                 return this.socket;
             }
         },
+        {
+            /// connection management methods
+            key: "startSession",
+            value: function startSession(token) {
+                this.setAuthToken(token);
+                this.initSocket();
+            }
+        },
+        {
+            key: "onConnect",
+            value: function onConnect(callback) {
+                var _this = this;
+                var _this_socket;
+                if (!this.connectCallbacks.includes(callback)) {
+                    this.connectCallbacks.push(callback);
+                }
+                if ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) {
+                    callback();
+                }
+                return function() {
+                    return _this.offConnect(callback);
+                };
+            }
+        },
+        {
+            key: "offConnect",
+            value: function offConnect(callback) {
+                this.connectCallbacks = this.connectCallbacks.filter(function(cb) {
+                    return cb !== callback;
+                });
+            }
+        },
+        {
+            key: "onDisconnect",
+            value: function onDisconnect(callback) {
+                var _this = this;
+                if (!this.disconnectCallbacks.includes(callback)) {
+                    this.disconnectCallbacks.push(callback);
+                }
+                if (this.socket && !this.socket.connected) {
+                    callback();
+                }
+                return function() {
+                    return _this.offDisconnect(callback);
+                };
+            }
+        },
+        {
+            key: "offDisconnect",
+            value: function offDisconnect(callback) {
+                this.disconnectCallbacks = this.disconnectCallbacks.filter(function(cb) {
+                    return cb !== callback;
+                });
+            }
+        },
+        {
+            key: "isConnected",
+            value: function isConnected() {
+                var _this_socket;
+                return ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) || false;
+            }
+        },
+        {
+            key: "setAuthToken",
+            value: function setAuthToken(token) {
+                this.authToken = token;
+                if (this.socket) {
+                    this.socket.connect();
+                }
+            }
+        },
+        {
+            key: "disconnectSocket",
+            value: function disconnectSocket() {
+                if (this.socket) {
+                    this.socket.io.engine.close();
+                }
+            }
+        },
         {
             /// subscribe to collections
             key: "subscribeToCollections",
             value: function subscribeToCollections(config) {
+                var _this = this;
                 if (config.length === 0) {
                     return function() {};
                 }
@@ -1268,48 +1360,24 @@ var SocketService = /*#__PURE__*/ function() {
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
                     var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers, conditions = configuration.conditions, orderBy2 = configuration.orderBy;
-                    s.on("initial:".concat(collectionName), onFirstTime);
-                    eventHandlers.push({
-                        eventName: "initial:".concat(collectionName),
-                        handler: onFirstTime
-                    });
-                    s.on("add:".concat(collectionName), onAdd);
-                    eventHandlers.push({
-                        eventName: "add:".concat(collectionName),
-                        handler: onAdd
-                    });
-                    s.on("update:".concat(collectionName), onModify);
-                    eventHandlers.push({
-                        eventName: "update:".concat(collectionName),
-                        handler: onModify
-                    });
-                    s.on("delete:".concat(collectionName), onRemove);
-                    eventHandlers.push({
-                        eventName: "delete:".concat(collectionName),
-                        handler: onRemove
-                    });
-                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
-                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
-                        s.on("initial:".concat(collectionName), extraOnFirstTime);
+                    var attach = function(eventName, handler) {
+                        _this.socket.off(eventName, handler);
+                        _this.socket.on(eventName, handler);
                         eventHandlers.push({
-                            eventName: "initial:".concat(collectionName),
-                            handler: extraOnFirstTime
-                        });
-                        s.on("add:".concat(collectionName), extraOnAdd);
-                        eventHandlers.push({
-                            eventName: "add:".concat(collectionName),
-                            handler: extraOnAdd
-                        });
-                        s.on("update:".concat(collectionName), extraOnModify);
-                        eventHandlers.push({
-                            eventName: "update:".concat(collectionName),
-                            handler: extraOnModify
-                        });
-                        s.on("delete:".concat(collectionName), extraOnRemove);
-                        eventHandlers.push({
-                            eventName: "delete:".concat(collectionName),
-                            handler: extraOnRemove
+                            eventName: eventName,
+                            handler: handler
                         });
+                    };
+                    attach("initial:".concat(collectionName), onFirstTime);
+                    attach("add:".concat(collectionName), onAdd);
+                    attach("update:".concat(collectionName), onModify);
+                    attach("delete:".concat(collectionName), onRemove);
+                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
+                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
+                        attach("initial:".concat(collectionName), extraOnFirstTime);
+                        attach("add:".concat(collectionName), extraOnAdd);
+                        attach("update:".concat(collectionName), extraOnModify);
+                        attach("delete:".concat(collectionName), extraOnRemove);
                     });
                 });
                 s.emit("subscribe_collections", collectionsNames, function(callback) {
@@ -1410,64 +1478,6 @@ var SocketService = /*#__PURE__*/ function() {
                     });
                 });
             }
-        },
-        {
-            /// connection management methods
-            key: "onConnect",
-            value: function onConnect(callback) {
-                var _this_socket;
-                this.connectCallbacks.push(callback);
-                if ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) {
-                    callback();
-                }
-            }
-        },
-        {
-            key: "offConnect",
-            value: function offConnect(callback) {
-                this.connectCallbacks = this.connectCallbacks.filter(function(cb) {
-                    return cb !== callback;
-                });
-            }
-        },
-        {
-            key: "onDisconnect",
-            value: function onDisconnect(callback) {
-                this.disconnectCallbacks.push(callback);
-                if (this.socket && !this.socket.connected) {
-                    callback();
-                }
-            }
-        },
-        {
-            key: "offDisconnect",
-            value: function offDisconnect(callback) {
-                this.disconnectCallbacks = this.disconnectCallbacks.filter(function(cb) {
-                    return cb !== callback;
-                });
-            }
-        },
-        {
-            key: "isConnected",
-            value: function isConnected() {
-                var _this_socket;
-                return ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) || false;
-            }
-        },
-        {
-            key: "setAuthToken",
-            value: function setAuthToken(token) {
-                this.authToken = token;
-                if (this.socket) {
-                    this.socket.auth = {
-                        token: token
-                    };
-                    if (this.socket.connected) {
-                        this.socket.disconnect();
-                    }
-                    this.socket.connect();
-                }
-            }
         }
     ], [
         {

package/dist/components/index.mjs

@@ -971,6 +971,7 @@ var dataSocketDomain = isLocal ? "http://localhost:9009/api/data-socket" : baseD
 var dataSyncDomain = isLocal ? "http://localhost:9010/api/data-sync" : baseDomain + "/data-sync";
 // src/helpers/socket.ts
 import { io } from "socket.io-client";
+var SESSION_STORAGE_KEY = "sessionId";
 var SocketService = /*#__PURE__*/ function() {
     "use strict";
     function _SocketService() {
@@ -990,19 +991,24 @@ var SocketService = /*#__PURE__*/ function() {
                     var socketUrl = isLocal ? "http://localhost:9009" : mode === "qa" ? "https://nx-api.xyz" : "https://nx-api.info";
                     this.socket = io(socketUrl, {
                         path: "/api/data-socket/connect",
-                        transports: [
-                            "websocket"
-                        ],
-                        auth: this.authToken ? {
-                            token: this.authToken
-                        } : void 0
+                        auth: function(cb) {
+                            var sessionId = localStorage.getItem(SESSION_STORAGE_KEY) || void 0;
+                            var token = _this.authToken;
+                            var authPayload = {};
+                            if (token) authPayload.token = token;
+                            if (sessionId) authPayload.sessionId = sessionId;
+                            cb(authPayload);
+                        },
+                        reconnection: true,
+                        reconnectionAttempts: 30,
+                        reconnectionDelay: 2 * 1e3
                     });
                     this.socket.on("connect", function() {
-                        var _this_socket;
-                        console.log("Socket connected:", (_this_socket = _this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.id);
-                    });
-                    this.connectCallbacks.forEach(function(cb) {
-                        return cb();
+                        var _this_socket, _this_socket1;
+                        console.log("\uD83D\uDFE2 Socket connected: ".concat((_this_socket = _this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.id, " (recovered - ").concat((_this_socket1 = _this.socket) === null || _this_socket1 === void 0 ? void 0 : _this_socket1.recovered, ")"));
+                        _this.connectCallbacks.forEach(function(cb) {
+                            return cb();
+                        });
                     });
                     this.socket.on("disconnect", function(reason) {
                         console.log("Socket disconnected:", reason);
@@ -1010,6 +1016,12 @@ var SocketService = /*#__PURE__*/ function() {
                             return cb();
                         });
                     });
+                    this.socket.on("session", function(param) {
+                        var sessionId = param.sessionId;
+                        if (sessionId) {
+                            localStorage.setItem(SESSION_STORAGE_KEY, sessionId);
+                        }
+                    });
                     this.socket.on("connect_error", function(error) {
                         console.error("Socket connection error:", error);
                     });
@@ -1032,10 +1044,90 @@ var SocketService = /*#__PURE__*/ function() {
                 return this.socket;
             }
         },
+        {
+            /// connection management methods
+            key: "startSession",
+            value: function startSession(token) {
+                this.setAuthToken(token);
+                this.initSocket();
+            }
+        },
+        {
+            key: "onConnect",
+            value: function onConnect(callback) {
+                var _this = this;
+                var _this_socket;
+                if (!this.connectCallbacks.includes(callback)) {
+                    this.connectCallbacks.push(callback);
+                }
+                if ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) {
+                    callback();
+                }
+                return function() {
+                    return _this.offConnect(callback);
+                };
+            }
+        },
+        {
+            key: "offConnect",
+            value: function offConnect(callback) {
+                this.connectCallbacks = this.connectCallbacks.filter(function(cb) {
+                    return cb !== callback;
+                });
+            }
+        },
+        {
+            key: "onDisconnect",
+            value: function onDisconnect(callback) {
+                var _this = this;
+                if (!this.disconnectCallbacks.includes(callback)) {
+                    this.disconnectCallbacks.push(callback);
+                }
+                if (this.socket && !this.socket.connected) {
+                    callback();
+                }
+                return function() {
+                    return _this.offDisconnect(callback);
+                };
+            }
+        },
+        {
+            key: "offDisconnect",
+            value: function offDisconnect(callback) {
+                this.disconnectCallbacks = this.disconnectCallbacks.filter(function(cb) {
+                    return cb !== callback;
+                });
+            }
+        },
+        {
+            key: "isConnected",
+            value: function isConnected() {
+                var _this_socket;
+                return ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) || false;
+            }
+        },
+        {
+            key: "setAuthToken",
+            value: function setAuthToken(token) {
+                this.authToken = token;
+                if (this.socket) {
+                    this.socket.connect();
+                }
+            }
+        },
+        {
+            key: "disconnectSocket",
+            value: function disconnectSocket() {
+                if (this.socket) {
+                    this.socket.io.engine.close();
+                }
+            }
+        },
         {
             /// subscribe to collections
             key: "subscribeToCollections",
             value: function subscribeToCollections(config) {
+                var _this = this;
                 if (config.length === 0) {
                     return function() {};
                 }
@@ -1046,48 +1138,24 @@ var SocketService = /*#__PURE__*/ function() {
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
                     var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers, conditions = configuration.conditions, orderBy2 = configuration.orderBy;
-                    s.on("initial:".concat(collectionName), onFirstTime);
-                    eventHandlers.push({
-                        eventName: "initial:".concat(collectionName),
-                        handler: onFirstTime
-                    });
-                    s.on("add:".concat(collectionName), onAdd);
-                    eventHandlers.push({
-                        eventName: "add:".concat(collectionName),
-                        handler: onAdd
-                    });
-                    s.on("update:".concat(collectionName), onModify);
-                    eventHandlers.push({
-                        eventName: "update:".concat(collectionName),
-                        handler: onModify
-                    });
-                    s.on("delete:".concat(collectionName), onRemove);
-                    eventHandlers.push({
-                        eventName: "delete:".concat(collectionName),
-                        handler: onRemove
-                    });
-                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
-                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
-                        s.on("initial:".concat(collectionName), extraOnFirstTime);
+                    var attach = function(eventName, handler) {
+                        _this.socket.off(eventName, handler);
+                        _this.socket.on(eventName, handler);
                         eventHandlers.push({
-                            eventName: "initial:".concat(collectionName),
-                            handler: extraOnFirstTime
-                        });
-                        s.on("add:".concat(collectionName), extraOnAdd);
-                        eventHandlers.push({
-                            eventName: "add:".concat(collectionName),
-                            handler: extraOnAdd
-                        });
-                        s.on("update:".concat(collectionName), extraOnModify);
-                        eventHandlers.push({
-                            eventName: "update:".concat(collectionName),
-                            handler: extraOnModify
-                        });
-                        s.on("delete:".concat(collectionName), extraOnRemove);
-                        eventHandlers.push({
-                            eventName: "delete:".concat(collectionName),
-                            handler: extraOnRemove
+                            eventName: eventName,
+                            handler: handler
                         });
+                    };
+                    attach("initial:".concat(collectionName), onFirstTime);
+                    attach("add:".concat(collectionName), onAdd);
+                    attach("update:".concat(collectionName), onModify);
+                    attach("delete:".concat(collectionName), onRemove);
+                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
+                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
+                        attach("initial:".concat(collectionName), extraOnFirstTime);
+                        attach("add:".concat(collectionName), extraOnAdd);
+                        attach("update:".concat(collectionName), extraOnModify);
+                        attach("delete:".concat(collectionName), extraOnRemove);
                     });
                 });
                 s.emit("subscribe_collections", collectionsNames, function(callback) {
@@ -1188,64 +1256,6 @@ var SocketService = /*#__PURE__*/ function() {
                     });
                 });
             }
-        },
-        {
-            /// connection management methods
-            key: "onConnect",
-            value: function onConnect(callback) {
-                var _this_socket;
-                this.connectCallbacks.push(callback);
-                if ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) {
-                    callback();
-                }
-            }
-        },
-        {
-            key: "offConnect",
-            value: function offConnect(callback) {
-                this.connectCallbacks = this.connectCallbacks.filter(function(cb) {
-                    return cb !== callback;
-                });
-            }
-        },
-        {
-            key: "onDisconnect",
-            value: function onDisconnect(callback) {
-                this.disconnectCallbacks.push(callback);
-                if (this.socket && !this.socket.connected) {
-                    callback();
-                }
-            }
-        },
-        {
-            key: "offDisconnect",
-            value: function offDisconnect(callback) {
-                this.disconnectCallbacks = this.disconnectCallbacks.filter(function(cb) {
-                    return cb !== callback;
-                });
-            }
-        },
-        {
-            key: "isConnected",
-            value: function isConnected() {
-                var _this_socket;
-                return ((_this_socket = this.socket) === null || _this_socket === void 0 ? void 0 : _this_socket.connected) || false;
-            }
-        },
-        {
-            key: "setAuthToken",
-            value: function setAuthToken(token) {
-                this.authToken = token;
-                if (this.socket) {
-                    this.socket.auth = {
-                        token: token
-                    };
-                    if (this.socket.connected) {
-                        this.socket.disconnect();
-                    }
-                    this.socket.connect();
-                }
-            }
         }
     ], [
         {

package/dist/helpers/index.d.mts

@@ -6,7 +6,6 @@ import { WhereFilterOp, Unsubscribe, Firestore, CollectionReference, DocumentDat
 import { TObject, NxUser, CountryOptions, LanguageOptions, UserPermissionsObject, userPermissionsObjectValue, Client, RedisUpdateType, RedisUpdatePayload, SocketCallbackResponse } from 'akeyless-types-commons';
 import React, { Dispatch, SetStateAction } from 'react';
 import { ClassValue } from 'clsx';
-import { Socket } from 'socket.io-client';
 
 type SetState<T> = (updater: ((prev: T) => T) | T) => void;
 type AppName = "installer" | "toolbox" | "dashboard";
@@ -278,7 +277,15 @@ declare class SocketService {
     private initSocket;
     private constructor();
     static getInstance(): SocketService;
-    getSocketInstance(): Socket;
+    private getSocketInstance;
+    startSession(token: string): void;
+    onConnect(callback: () => void): () => void;
+    offConnect(callback: () => void): void;
+    onDisconnect(callback: () => void): () => void;
+    offDisconnect(callback: () => void): void;
+    isConnected(): boolean;
+    setAuthToken(token: string): void;
+    disconnectSocket(): void;
     subscribeToCollections(config: OnSnapshotConfig[]): () => void;
     setData<UpdateType extends RedisUpdateType, DataType = any>(payload: RedisUpdatePayload<UpdateType, DataType>): Promise<SocketCallbackResponse>;
     getCollectionData<T>(payload: Omit<GetDataPayload<T>, "key">): void;
@@ -288,12 +295,6 @@ declare class SocketService {
         collection_name: string;
     }): Promise<SocketCallbackResponse>;
     clearAllRedisData(): Promise<SocketCallbackResponse>;
-    onConnect(callback: () => void): void;
-    offConnect(callback: () => void): void;
-    onDisconnect(callback: () => void): void;
-    offDisconnect(callback: () => void): void;
-    isConnected(): boolean;
-    setAuthToken(token: string): void;
 }
 declare const socketServiceInstance: SocketService;
 

package/dist/helpers/index.d.ts

@@ -6,7 +6,6 @@ import { WhereFilterOp, Unsubscribe, Firestore, CollectionReference, DocumentDat
 import { TObject, NxUser, CountryOptions, LanguageOptions, UserPermissionsObject, userPermissionsObjectValue, Client, RedisUpdateType, RedisUpdatePayload, SocketCallbackResponse } from 'akeyless-types-commons';
 import React, { Dispatch, SetStateAction } from 'react';
 import { ClassValue } from 'clsx';
-import { Socket } from 'socket.io-client';
 
 type SetState<T> = (updater: ((prev: T) => T) | T) => void;
 type AppName = "installer" | "toolbox" | "dashboard";
@@ -278,7 +277,15 @@ declare class SocketService {
     private initSocket;
     private constructor();
     static getInstance(): SocketService;
-    getSocketInstance(): Socket;
+    private getSocketInstance;
+    startSession(token: string): void;
+    onConnect(callback: () => void): () => void;
+    offConnect(callback: () => void): void;
+    onDisconnect(callback: () => void): () => void;
+    offDisconnect(callback: () => void): void;
+    isConnected(): boolean;
+    setAuthToken(token: string): void;
+    disconnectSocket(): void;
     subscribeToCollections(config: OnSnapshotConfig[]): () => void;
     setData<UpdateType extends RedisUpdateType, DataType = any>(payload: RedisUpdatePayload<UpdateType, DataType>): Promise<SocketCallbackResponse>;
     getCollectionData<T>(payload: Omit<GetDataPayload<T>, "key">): void;
@@ -288,12 +295,6 @@ declare class SocketService {
         collection_name: string;
     }): Promise<SocketCallbackResponse>;
     clearAllRedisData(): Promise<SocketCallbackResponse>;
-    onConnect(callback: () => void): void;
-    offConnect(callback: () => void): void;
-    onDisconnect(callback: () => void): void;
-    offDisconnect(callback: () => void): void;
-    isConnected(): boolean;
-    setAuthToken(token: string): void;
 }
 declare const socketServiceInstance: SocketService;