Merge pull request #155 from RedisInsight/main

a new release candidate

Author: egor-zalenski

package.json

@@ -167,8 +167,8 @@
     "cross-env": "^7.0.2",
     "css-loader": "^5.0.1",
     "css-minimizer-webpack-plugin": "^1.2.0",
-    "electron": "^15.3.1",
-    "electron-builder": "^22.14.5",
+    "electron": "^16.0.5",
+    "electron-builder": "^22.14.10",
     "electron-builder-notarize": "^1.2.0",
     "electron-debug": "^3.1.0",
     "electron-devtools-installer": "^3.2.0",
@@ -236,7 +236,7 @@
     "electron-context-menu": "^3.1.0",
     "electron-log": "^4.2.4",
     "electron-store": "^8.0.0",
-    "electron-updater": "4.6.1",
+    "electron-updater": "4.6.5",
     "formik": "^2.2.9",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
@@ -245,14 +245,14 @@
     "react-contenteditable": "^3.3.5",
     "react-dom": "^17.0.1",
     "react-hotkeys-hook": "^3.3.1",
+    "react-jsx-parser": "^1.28.4",
     "react-monaco-editor": "^0.44.0",
     "react-redux": "^7.2.2",
-    "react-jsx-parser": "^1.28.4",
     "react-router-dom": "^5.2.0",
     "react-virtualized": "^9.22.2",
+    "rehype-stringify": "^9.0.2",
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.0.1",
-    "rehype-stringify": "^9.0.2",
     "unified": "^10.1.1",
     "unist-util-visit": "^4.1.0"
   },

redisinsight/api/config/default.ts

@@ -48,7 +48,7 @@ export default {
     migrationsRun: process.env.DB_MIGRATIONS ? process.env.DB_MIGRATIONS === 'true' : true,
   },
   redis_cloud: {
-    url: process.env.REDIS_CLOUD_URL || 'https://qa-api.redislabs.com/v1/',
+    url: process.env.REDIS_CLOUD_URL || 'https://api.qa.redislabs.com/v1',
   },
   redis_clients: {
     idleSyncInterval: parseInt(process.env.CLIENTS_IDLE_SYNC_INTERVAL, 10) || 1000 * 60 * 60, // 1hr

redisinsight/api/config/production.ts

@@ -18,6 +18,6 @@ export default {
     database: join(homedir, 'redisinsight.db'),
   },
   redis_cloud: {
-    url: process.env.REDIS_CLOUD_URL || 'https://api.redislabs.com/v1/',
+    url: process.env.REDIS_CLOUD_URL || 'https://api.redislabs.com/v1',
   },
 };

redisinsight/api/src/dto/server.dto.ts

@@ -42,4 +42,10 @@ export class GetServerInfoResponse {
     example: ['PLAIN', 'KEYTAR'],
   })
   encryptionStrategies: string[];
+
+  @ApiProperty({
+    description: 'Server session id.',
+    type: Number,
+  })
+  sessionId: number;
 }

redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts

@@ -149,8 +149,8 @@ export class CliBusinessService {
       const replyEncoding = checkHumanReadableCommands(`${command} ${args[0]}`) ? 'utf8' : undefined;
       this.checkUnsupportedCommands(`${command} ${args[0]}`);
 
-      const reply = await this.cliTool.execCommand(clientOptions, command, args, replyEncoding);
       namespace = this.cliTool.getRedisClientNamespace(clientOptions);
+      const reply = await this.cliTool.execCommand(clientOptions, command, args, replyEncoding);
 
       this.logger.log('Succeed to execute redis CLI command.');
       this.cliAnalyticsService.sendCommandExecutedEvent(
@@ -225,6 +225,8 @@ export class CliBusinessService {
       const [command, ...args] = splitCliCommandLine(commandLine);
       const replyEncoding = checkHumanReadableCommands(`${command} ${args[0]}`) ? 'utf8' : undefined;
       this.checkUnsupportedCommands(`${command} ${args[0]}`);
+      namespace = this.cliTool.getRedisClientNamespace(clientOptions);
+
       const result = await this.cliTool.execCommandForNodes(
         clientOptions,
         command,
@@ -233,7 +235,6 @@ export class CliBusinessService {
         replyEncoding,
       );
 
-      namespace = this.cliTool.getRedisClientNamespace(clientOptions);
       return result.map((nodeExecReply) => {
         this.cliAnalyticsService.sendClusterCommandExecutedEvent(
           clientOptions.instanceId,

redisinsight/api/src/modules/core/providers/server-on-premise/server-on-premise.service.spec.ts

@@ -39,6 +39,7 @@ describe('ServerOnPremiseService', () => {
   let serverRepository: MockType<Repository<ServerEntity>>;
   let eventEmitter: EventEmitter2;
   let encryptionService: MockType<EncryptionService>;
+  const sessionId = new Date().getTime();
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -88,12 +89,12 @@ describe('ServerOnPremiseService', () => {
       serverRepository.findOne.mockResolvedValue(null);
       serverRepository.create.mockReturnValue(mockServerEntity);
 
-      await service.onApplicationBootstrap();
+      await service.onApplicationBootstrap(sessionId);
 
       expect(eventEmitter.emit).toHaveBeenNthCalledWith(
         1,
         AppAnalyticsEvents.Initialize,
-        mockServerEntity.id,
+        { anonymousId: mockServerEntity.id, sessionId },
       );
       expect(eventEmitter.emit).toHaveBeenNthCalledWith(
         2,
@@ -107,12 +108,12 @@ describe('ServerOnPremiseService', () => {
     it('should emit APPLICATION_STARTED on second application launch', async () => {
       serverRepository.findOne.mockResolvedValue(mockServerEntity);
 
-      await service.onApplicationBootstrap();
+      await service.onApplicationBootstrap(sessionId);
 
       expect(eventEmitter.emit).toHaveBeenNthCalledWith(
         1,
         AppAnalyticsEvents.Initialize,
-        mockServerEntity.id,
+        { anonymousId: mockServerEntity.id, sessionId },
       );
       expect(eventEmitter.emit).toHaveBeenNthCalledWith(
         2,

redisinsight/api/src/modules/core/providers/server-on-premise/server-on-premise.service.ts

@@ -27,13 +27,16 @@ implements OnApplicationBootstrap, IServerProvider {
 
   private encryptionService: EncryptionService;
 
+  private sessionId: number;
+
   constructor(repository, eventEmitter, encryptionService) {
     this.repository = repository;
     this.eventEmitter = eventEmitter;
     this.encryptionService = encryptionService;
   }
 
-  async onApplicationBootstrap() {
+  async onApplicationBootstrap(sessionId: number = new Date().getTime()) {
+    this.sessionId = sessionId;
     await this.upsertServerInfo();
   }
 
@@ -45,7 +48,7 @@ implements OnApplicationBootstrap, IServerProvider {
       // Create default server info on first application launch
       serverInfo = this.repository.create({});
       await this.repository.save(serverInfo);
-      this.eventEmitter.emit(AppAnalyticsEvents.Initialize, serverInfo.id);
+      this.eventEmitter.emit(AppAnalyticsEvents.Initialize, { anonymousId: serverInfo.id, sessionId: this.sessionId });
       this.eventEmitter.emit(AppAnalyticsEvents.Track, {
         event: TelemetryEvents.ApplicationFirstStart,
         eventData: {
@@ -57,7 +60,7 @@ implements OnApplicationBootstrap, IServerProvider {
       });
     } else {
       this.logger.log('Application started.');
-      this.eventEmitter.emit(AppAnalyticsEvents.Initialize, serverInfo.id);
+      this.eventEmitter.emit(AppAnalyticsEvents.Initialize, { anonymousId: serverInfo.id, sessionId: this.sessionId });
       this.eventEmitter.emit(AppAnalyticsEvents.Track, {
         event: TelemetryEvents.ApplicationStarted,
         eventData: {
@@ -82,6 +85,7 @@ implements OnApplicationBootstrap, IServerProvider {
       }
       const result = {
         ...info,
+        sessionId: this.sessionId,
         appVersion: SERVER_CONFIG.appVersion,
         osPlatform: process.platform,
         buildType: SERVER_CONFIG.buildType,

redisinsight/api/src/modules/core/services/analytics/analytics.service.spec.ts

@@ -33,6 +33,7 @@ const mockSettingsWithoutPermission = {
 describe('AnalyticsService', () => {
   let service: AnalyticsService;
   let settingsService: ISettingsProvider;
+  const sessionId = new Date().getTime();
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -58,7 +59,7 @@ describe('AnalyticsService', () => {
 
   describe('initialize', () => {
     it('should set anonymousId', () => {
-      service.initialize(mockAnonymousId);
+      service.initialize({ anonymousId: mockAnonymousId, sessionId });
 
       const anonymousId = service.getAnonymousId();
 
@@ -69,7 +70,7 @@ describe('AnalyticsService', () => {
   describe('sendEvent', () => {
     beforeEach(() => {
       mockAnalyticsTrack = jest.fn();
-      service.initialize(mockAnonymousId);
+      service.initialize({ anonymousId: mockAnonymousId, sessionId });
     });
     it('should send event with anonymousId if permission are granted', async () => {
       settingsService.getSettings = jest
@@ -84,6 +85,7 @@ describe('AnalyticsService', () => {
 
       expect(mockAnalyticsTrack).toHaveBeenCalledWith({
         anonymousId: mockAnonymousId,
+        integrations: { Amplitude: { session_id: sessionId } },
         event: TelemetryEvents.ApplicationStarted,
         properties: {},
       });
@@ -114,6 +116,7 @@ describe('AnalyticsService', () => {
 
       expect(mockAnalyticsTrack).toHaveBeenCalledWith({
         anonymousId: NON_TRACKING_ANONYMOUS_ID,
+        integrations: { Amplitude: { session_id: sessionId } },
         event: TelemetryEvents.ApplicationStarted,
         properties: {},
       });

redisinsight/api/src/modules/core/services/analytics/analytics.service.ts

@@ -15,10 +15,17 @@ export interface ITelemetryEvent {
   nonTracking: boolean;
 }
 
+export interface ITelemetryInitEvent {
+  anonymousId: string;
+  sessionId: number;
+}
+
 @Injectable()
 export class AnalyticsService {
   private anonymousId: string = NON_TRACKING_ANONYMOUS_ID;
 
+  private sessionId: number = -1;
+
   private analytics;
 
   constructor(
@@ -31,7 +38,9 @@ export class AnalyticsService {
   }
 
   @OnEvent(AppAnalyticsEvents.Initialize)
-  public initialize(anonymousId: string) {
+  public initialize(payload: ITelemetryInitEvent) {
+    const { anonymousId, sessionId } = payload;
+    this.sessionId = sessionId;
     this.anonymousId = anonymousId;
     this.analytics = new Analytics(ANALYTICS_CONFIG.writeKey);
   }
@@ -55,6 +64,7 @@ export class AnalyticsService {
       if (isAnalyticsGranted) {
         this.analytics.track({
           anonymousId: this.anonymousId,
+          integrations: { Amplitude: { session_id: this.sessionId } },
           event,
           properties: {
             ...eventData,
@@ -63,6 +73,7 @@ export class AnalyticsService {
       } else if (nonTracking) {
         this.analytics.track({
           anonymousId: NON_TRACKING_ANONYMOUS_ID,
+          integrations: { Amplitude: { session_id: this.sessionId } },
           event,
           properties: {
             ...eventData,

redisinsight/api/src/modules/shared/services/redis-cloud-business/redis-cloud-business.service.ts

@@ -50,7 +50,7 @@ export class RedisCloudBusinessService {
     try {
       const {
         data: { account },
-      }: AxiosResponse = await this.api.get(`${this.config.url}`, {
+      }: AxiosResponse = await this.api.get(`${this.config.url}/`, {
         headers: this.getAuthHeaders(apiKey, apiSecretKey),
       });
       this.logger.log('Succeed to get RE cloud account.');