Merge branch 'main' into feature/RI-4985-use-new-jsonpath

Author: kchepikava

.circleci/build/release-docker.sh

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

.eslintrc.js

@@ -2,6 +2,7 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    browser: true,
   },
   extends: ['airbnb-typescript'],
   plugins: ['@typescript-eslint'],

.github/build/release-docker.sh

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

.github/workflows/publish-stores.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Download Docker images
       run: |
         mkdir release
-        aws s3 cp s3://${AWS_BUCKET_NAME}/public/latest/docker ./release/docker --recursive
+        aws s3 cp s3://${AWS_BUCKET_NAME}/public/latest/docker ./release --recursive
 
     - name: Publish docker
       env:

.github/workflows/virustotal.yml

@@ -80,7 +80,7 @@ jobs:
         uploadZipFile="./${{ matrix.artifact }}.zip"
 
         # Compress artifactes
-        zip -r "${uploadZipFile}" "./release"
+        zip -r "${uploadZipFile}" "./release" ${{ startsWith(matrix.artifact, 'macos-') && '-x "*/redisstack/*" "*.tar.gz" "*.zip"' || '' }}
 
         # Generate url to download zip file
         uploadUrl=$(curl -sq -XGET https://www.virustotal.com/api/v3/files/upload_url -H "x-apikey: $VIRUSTOTAL_API_KEY" | jq -r '.data')

package.json

@@ -5,7 +5,12 @@
   "license": "SSPL",
   "private": true,
   "scripts": {
-    "dev:ui": "yarn --cwd redisinsight/ui dev",
+    "dev:ui": "cross-env yarn --cwd redisinsight/ui dev",
+    "dev:api": "cross-env yarn --cwd redisinsight/api start:dev",
+    "dev:electron:ui": "cross-env RI_APP_PORT=8080 RI_APP_TYPE=electron NODE_ENV=development yarn --cwd redisinsight/ui dev",
+    "dev:electron:api": "cross-env RI_APP_PORT=5540 RI_APP_TYPE=electron NODE_ENV=development USE_TCP_CLOUD_AUTH=true yarn --cwd redisinsight/api start:dev",
+    "dev:electron": "cross-env RI_APP_TYPE=electron RI_AUTO_BOOTSTRAP=false NODE_ENV=development USE_TCP_CLOUD_AUTH=true yarn --cwd redisinsight/desktop dev",
+    "dev:desktop": "concurrently \"yarn dev:electron:api\" \"yarn dev:electron:ui\" \"yarn dev:electron\"",
     "build:ui": "cross-env NODE_ENV=production RI_APP_TYPE=web yarn --cwd redisinsight/ui build",
     "build:renderer": "cross-env NODE_ENV=production RI_APP_TYPE=electron yarn --cwd redisinsight/ui build --emptyOutDir && copyfiles ./redisinsight/desktop/splash.html ./redisinsight/dist/renderer -f",
     "stats:ui": "yarn --cwd redisinsight/ui stats",
@@ -23,6 +28,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:ui": "eslint ./redisinsight/ui --ext .js,.jsx,.ts,.tsx",
     "lint:api": "yarn --cwd redisinsight/api lint",
+    "lint:desktop": "eslint ./redisinsight/desktop",
     "lint:e2e": "yarn --cwd tests/e2e lint",
     "package": "yarn package:dev",
     "package:prod": "ts-node ./scripts/prebuild.js dist && yarn build:prod && electron-builder build -p never",
@@ -34,8 +40,10 @@
     "package:mac": "yarn build:prod && electron-builder build --mac -p never",
     "package:mac:arm": "yarn build:prod && electron-builder build --mac --arm64 -p never",
     "package:linux": "yarn build:prod && electron-builder build --linux -p never",
-    "postinstall": "patch-package && vite optimize && skip-postinstall || (electron-builder install-app-deps && yarn-deduplicate yarn.lock)",
+    "postinstall": "patch-package && vite optimize -c ./redisinsight/ui/vite.config.mjs && skip-postinstall || (electron-builder install-app-deps && yarn-deduplicate yarn.lock)",
     "test": "jest ./redisinsight/ui -w 1",
+    "test:api": "yarn --cwd redisinsight/api test",
+    "test:api:integration": "yarn --cwd redisinsight/api test:api",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
     "test:cov": "cross-env NODE_OPTIONS='' jest ./redisinsight/ui --silent --coverage --no-cache --forceExit -w 3",
     "test:cov:unit": "jest ./redisinsight/ui --group=-component --coverage -w 1",
@@ -244,6 +252,7 @@
     "monaco-editor": "^0.48.0",
     "monaco-yaml": "^5.1.1",
     "msgpackr": "^1.10.1",
+    "node-abi": "^3.71.0",
     "pako": "^2.1.0",
     "php-serialize": "^4.0.2",
     "pickleparser": "^0.2.1",
@@ -280,4 +289,4 @@
   "browser": {
     "uuid": "./node_modules/uuid/dist/esm-browser/index.js"
   }
-}
+}

redisinsight/api/config/default.ts

@@ -80,7 +80,7 @@ export default {
     migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
     autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.60.0',
+    appVersion: process.env.RI_APP_VERSION || '2.62.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/swagger.ts

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

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.60.0",
+  "version": "2.62.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {

redisinsight/api/src/main.ts

@@ -29,7 +29,10 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
     await migrateHomeFolder() && await removeOldFolders();
   }
 
-  const { port, host } = serverConfig;
+  if (apiPort) {
+    serverConfig.port = apiPort;
+  }
+
   const logger = WinstonModule.createLogger(LOGGER_CONFIG);
 
   const options: NestApplicationOptions = {
@@ -46,7 +49,7 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
   app.use(bodyParser.urlencoded({ limit: '512mb', extended: true }));
   app.enableCors();
 
-  if (process.env.RI_APP_TYPE !== 'electron') {
+  if (process.env.RI_APP_TYPE !== 'electron' || process.env.NODE_ENV === 'development') {
     let prefix = serverConfig.globalPrefix;
     if (serverConfig.proxyPath) {
       prefix = posix.join(serverConfig.proxyPath, prefix);
@@ -75,7 +78,9 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
 
   const logFileProvider = app.get(LogFileProvider);
 
-  await app.listen(apiPort || port, host);
+  const { port, host } = serverConfig;
+
+  await app.listen(port, host);
   logger.log({
     message: `Server is running on http(s)://${host}:${port}`,
     context: 'bootstrap',