Merge pull request #3094 from RedisInsight/release/2.44.0

Release/2.44.0 to latest

Author: vlad-dargel

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.42.0)
+-v - Semver (2.44.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -201,6 +201,9 @@ parameters:
   docker:
     type: string
     default: *ignore
+  redis_client:
+    type: string
+    default: ""
 
 jobs:
   # Test jobs
@@ -302,6 +305,10 @@ jobs:
         description: Send report for test run to slack
         type: boolean
         default: false
+      redis_client:
+        description: Library to use for redis connection
+        type: string
+        default: ""
     steps:
       - checkout
       - restore_cache:
@@ -319,6 +326,10 @@ jobs:
       - run:
           name: Run tests
           command: |
+            if [ << parameters.redis_client >> != "" ]; then
+              export RI_REDIS_CLIENTS_FORCE_STRATEGY=<< parameters.redis_client >>
+            fi
+
             ./redisinsight/api/test/test-runs/start-test-run.sh -r << parameters.rte >> -t << parameters.build >>
             mkdir -p mkdir itest/coverages && mkdir -p itest/results
             cp ./redisinsight/api/test/test-runs/coverage/test-run-result.json ./itest/results/<< parameters.rte >>.result.json
@@ -410,7 +421,11 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: choco install nodejs --version=18.15.0
+      - run: 
+          command: |
+            nvm install 18.15.0
+            nvm use 18.15.0
+            npm install --global yarn
       - run:
           command: |
             cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/electron/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
@@ -755,7 +770,10 @@ jobs:
       - run:
           name: Build windows exe
           command: |
-            choco install nodejs --version=18.15.0
+            nvm install 18.15.0
+            nvm use 18.15.0
+            npm install --global yarn
+
             # set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
             yarn install
             yarn --cwd redisinsight/api/ install
@@ -1175,6 +1193,7 @@ workflows:
                 - /^be/feature.*/
                 - /^be/bugfix.*/
       - integration-tests-run:
+          redis_client: << pipeline.parameters.redis_client >>
           matrix:
             alias: itest-code
             parameters:
@@ -1251,6 +1270,8 @@ workflows:
             alias: itest-code
             parameters:
               rte: *iTestsNames
+              redis_client:
+                - << pipeline.parameters.redis_client >>
           name: ITest - << matrix.rte >> (code)
           requires:
             - Start All Tests
@@ -1487,6 +1508,8 @@ workflows:
             alias: itest-code
             parameters:
               rte: *iTestsNames
+              redis_client:
+                - << pipeline.parameters.redis_client >>
           name: ITest - << matrix.rte >> (code)
           filters: *releaseAndLatestFilter
       - integration-tests-coverage:

configs/webpack.config.web.common.ts

@@ -65,7 +65,7 @@ export default {
 
   plugins: [
     new webpack.DefinePlugin({
-      'window.app.config.apiPort': JSON.stringify('5000'),
+      'window.app.config.apiPort': JSON.stringify('5540'),
     }),
 
     new HtmlWebpackPlugin({ template: 'index.html.ejs' }),

configs/webpack.config.web.dev.ts

@@ -6,17 +6,32 @@
  */
 
 import path from 'path';
+import os from 'os';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import ip from 'ip';
 import { toString } from 'lodash'
 import commonConfig from './webpack.config.web.common';
 
 function employCache(loaders) {
   return ['cache-loader'].concat(loaders);
 }
 
-const HOST = process.env.PUBLIC_DEV ? ip.address(): 'localhost'
+const getLocalIpAddress = () => {
+  const ifaces = os.networkInterfaces();
+
+  for (const ifaceName of Object.keys(ifaces)) {
+    const firstIpv4Address = ifaces[ifaceName].find(alias => alias.family === 'IPv4' && !alias.internal);
+
+    if (firstIpv4Address) {
+      return firstIpv4Address.address;
+    }
+  }
+
+  return 'localhost';
+};
+
+
+const HOST = process.env.PUBLIC_DEV ? getLocalIpAddress(): 'localhost';
 
 const configuration: webpack.Configuration = {
   target: 'web',

package.json

@@ -84,7 +84,8 @@
     "word-wrap": "1.2.4",
     "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
     "**/semver": "^7.5.2",
-    "rawproto/protobufjs": "^7.2.4"
+    "rawproto/protobufjs": "^7.2.4",
+    "**/follow-redirects": "^1.15.4"
   },
   "devDependencies": {
     "@babel/core": "^7.23.2",
@@ -190,7 +191,6 @@
     "husky": "^4.2.5",
     "identity-obj-proxy": "^3.0.0",
     "ioredis-mock": "^5.5.4",
-    "ip": "^1.1.8",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-runner-groups": "^2.2.0",

redisinsight/api/.eslintrc.js

@@ -20,9 +20,11 @@ module.exports = {
   },
   overrides: [
     {
-      files: [ '**/*.spec.ts' ],
+      files: [ '**/*.spec.ts', '**/__mocks__/**/*' ],
       rules: {
-        'no-duplicate-string': 'off',
+        'sonarjs/no-duplicate-string': 0,
+        'sonarjs/no-identical-functions': 0,
+        'import/first': 0,
       }
     }
   ]

redisinsight/api/config/default.ts

@@ -57,7 +57,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.42.0',
+    appVersion: process.env.RI_APP_VERSION || '2.44.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -72,6 +72,9 @@ export default {
     migrationsRun: process.env.RI_DB_MIGRATIONS ? process.env.RI_DB_MIGRATIONS === 'true' : true,
   },
   redis_clients: {
+    forceStrategy: process.env.RI_REDIS_CLIENTS_FORCE_STRATEGY,
+    idleThreshold: parseInt(process.env.RI_REDIS_CLIENTS_IDLE_THRESHOLD, 10) || 1000 * 60 * 60, // 1h
+    syncInterval: parseInt(process.env.RI_REDIS_CLIENTS_SYNC_INTERVAL, 10) || 1000 * 60, // 1m
     idleSyncInterval: parseInt(process.env.RI_CLIENTS_IDLE_SYNC_INTERVAL, 10) || 1000 * 60 * 60, // 1hr
     maxIdleThreshold: parseInt(process.env.RI_CLIENTS_MAX_IDLE_THRESHOLD, 10) || 1000 * 60 * 60, // 1hr
     retryTimes: parseInt(process.env.RI_CLIENTS_RETRY_TIMES, 10) || 3,

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2.3403,
+  "version": 2.3405,
   "features": {
     "insightsRecommendations": {
       "flag": true,
@@ -82,6 +82,13 @@
           }
         ]
       }
+    },
+    "redisClient": {
+      "flag": true,
+      "perc": [[0, 100]],
+      "data": {
+        "strategy": "ioredis"
+      }
     }
   }
 }

redisinsight/api/config/ormconfig.ts

@@ -13,14 +13,14 @@ import { CaCertificateEntity } from 'src/modules/certificate/entities/ca-certifi
 import { ClientCertificateEntity } from 'src/modules/certificate/entities/client-certificate.entity';
 import { DatabaseEntity } from 'src/modules/database/entities/database.entity';
 import { SshOptionsEntity } from 'src/modules/ssh/entities/ssh-options.entity';
-import { BrowserHistoryEntity } from 'src/modules/browser/entities/browser-history.entity';
+import { BrowserHistoryEntity } from 'src/modules/browser/browser-history/entities/browser-history.entity';
 import { CustomTutorialEntity } from 'src/modules/custom-tutorial/entities/custom-tutorial.entity';
 import { FeatureEntity } from 'src/modules/feature/entities/feature.entity';
 import { FeaturesConfigEntity } from 'src/modules/feature/entities/features-config.entity';
 import { CloudDatabaseDetailsEntity } from 'src/modules/cloud/database/entities/cloud-database-details.entity';
+import { CloudCapiKeyEntity } from 'src/modules/cloud/capi-key/entity/cloud-capi-key.entity';
 import migrations from '../migration';
 import * as config from '../src/utils/config';
-import { CloudCapiKeyEntity } from 'src/modules/cloud/capi-key/entity/cloud-capi-key.entity';
 
 const dbConfig = config.get('db');
 

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.42.0',
+    version: '2.44.0',
   },
   tags: [],
 };