Be/feature/ri 5876 fix start electron dev mode

.eslintrc.js

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

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/src/main.ts

@@ -46,7 +46,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);

redisinsight/api/src/modules/auth/window-auth/middleware/window.auth.middleware.ts

@@ -4,15 +4,16 @@ import ERROR_MESSAGES from 'src/constants/error-messages';
 import { API_HEADER_WINDOW_ID } from 'src/common/constants';
 import { WindowAuthService } from '../window-auth.service';
 import { WindowUnauthorizedException } from '../constants/exceptions';
+import config from 'src/utils/config';
 
 @Injectable()
 export class WindowAuthMiddleware implements NestMiddleware {
   private logger = new Logger('WindowAuthMiddleware');
-
   constructor(private windowAuthService: WindowAuthService) {}
 
   async use(req: Request, res: Response, next: NextFunction): Promise<any> {
     const { windowId } = WindowAuthMiddleware.getWindowIdFromReq(req);
+
     const isAuthorized = await this.windowAuthService.isAuthorized(windowId);
 
     if (!isAuthorized) {

redisinsight/api/src/modules/auth/window-auth/window-auth.module.ts

@@ -15,4 +15,4 @@ export class WindowAuthModule implements NestModule {
       .exclude(...SERVER_CONFIG.excludeAuthRoutes)
       .forRoutes('*');
   }
-}
+}

redisinsight/api/src/modules/cloud/auth/auth-strategy/tcp-cloud.auth.strategy.ts

@@ -0,0 +1,87 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { createServer, Server } from 'net';
+import { CloudAuthStrategy } from './cloud-auth.strategy';
+import { CloudAuthService } from '../cloud-auth.service';
+
+@Injectable()
+export class TcpCloudAuthStrategy extends CloudAuthStrategy {
+  private authPort = process.env.TCP_LOCAL_CLOUD_AUTH_PORT ? parseInt(process.env.TCP_LOCAL_CLOUD_AUTH_PORT) : 5542;
+  private server: Server;
+  private readonly logger = new Logger('TcpCloudAuthStrategy');
+
+  constructor(private readonly cloudAuthService: CloudAuthService) {
+    super();
+
+    this.initServer();
+  }
+
+  private initServer() {
+    this.server = createServer((socket) => {
+      socket.setEncoding('utf8');
+
+      socket.on('data', async (data) => {
+        try {
+          this.logger.debug(`Received raw data: ${data.toString()}`);
+          const { action, options } = JSON.parse(data.toString());
+          this.logger.debug('Parsed request:', { action, options });
+
+          if (action === 'getAuthUrl') {
+            try {
+              const url = await this.cloudAuthService.getAuthorizationUrl(
+                options.sessionMetadata,
+                options.authOptions
+              );
+              this.logger.debug('Generated URL:', url);
+              socket.write(JSON.stringify({ success: true, url }));
+            } catch (err) {
+              this.logger.error('Error getting authorization URL:', err);
+              socket.write(JSON.stringify({ 
+                success: false, 
+                error: err.message,
+                details: err.stack,
+                context: { action, options } // Add the context to help debug
+              }));
+            }
+          } else if (action === 'handleCallback') {
+            try {
+              this.logger.debug('Handling callback with query:', options.query);
+              const result = await this.cloudAuthService.handleCallback(options.query);
+              socket.write(JSON.stringify({ success: true, result }));
+            } catch (err) {
+              this.logger.error('Error handling callback:', err);
+              socket.write(JSON.stringify({ 
+                success: false, 
+                error: err.message,
+                details: err.stack 
+              }));
+            }
+          }
+        } catch (err) {
+          this.logger.error('Error processing request:', err);
+          socket.write(JSON.stringify({ 
+            success: false, 
+            error: err.message,
+            details: err.stack 
+          }));
+        }
+        socket.end();
+      });
+
+      socket.on('end', () => {
+        this.logger.debug('Client connection ended');
+      });
+
+      socket.on('error', (err) => {
+        this.logger.error('Socket error:', err);
+      });
+    });
+
+    this.server.listen(this.authPort, () => {
+      this.logger.log(`TCP server listening on port ${this.authPort}`);
+    });
+
+    this.server.on('error', (err) => {
+      this.logger.error('Server error:', err);
+    });
+  }
+}

redisinsight/api/src/modules/cloud/auth/cloud-auth.module.ts

@@ -6,6 +6,7 @@ import { SsoIdpCloudAuthStrategy } from 'src/modules/cloud/auth/auth-strategy/ss
 import { CloudAuthService } from 'src/modules/cloud/auth/cloud-auth.service';
 import { CloudAuthController } from 'src/modules/cloud/auth/cloud-auth.controller';
 import { CloudAuthAnalytics } from 'src/modules/cloud/auth/cloud-auth.analytics';
+import { TcpCloudAuthStrategy } from './auth-strategy/tcp-cloud.auth.strategy';
 
 @Module({
   imports: [CloudSessionModule],
@@ -15,8 +16,12 @@ import { CloudAuthAnalytics } from 'src/modules/cloud/auth/cloud-auth.analytics'
     SsoIdpCloudAuthStrategy,
     CloudAuthService,
     CloudAuthAnalytics,
+    ...(process.env.USE_TCP_CLOUD_AUTH === 'true' ? [TcpCloudAuthStrategy] : [])
   ],
   controllers: [CloudAuthController],
-  exports: [CloudAuthService],
+  exports: [
+    CloudAuthService,
+    ...(process.env.USE_TCP_CLOUD_AUTH === 'true' ? [TcpCloudAuthStrategy] : [])
+  ],
 })
-export class CloudAuthModule {}
+export class CloudAuthModule { }

redisinsight/api/src/modules/cloud/auth/cloud-auth.service.ts

@@ -44,7 +44,7 @@ export class CloudAuthService {
     private readonly ssoIdpCloudAuthStrategy: SsoIdpCloudAuthStrategy,
     private readonly analytics: CloudAuthAnalytics,
     private readonly eventEmitter: EventEmitter2,
-  ) {}
+  ) { }
 
   static getOAuthHttpRequestHeaders() {
     return {
@@ -69,7 +69,7 @@ export class CloudAuthService {
     ) {
       return (
         authRequest?.idpType === CloudAuthIdpType.GitHub
-          && query?.error_description?.indexOf('email') > -1
+        && query?.error_description?.indexOf('email') > -1
       )
         ? new CloudOauthGithubEmailPermissionException(query.error_description)
         : new CloudOauthMissedRequiredDataException(query.error_description, {

redisinsight/api/src/modules/database-recommendation/models/database-recommendation-params.ts

@@ -5,4 +5,4 @@ export class DatabaseRecommendationParams {
   @IsRedisString({ each: true })
   @RedisStringType({ each: true })
   keys?: RedisString[];
-}
+}

redisinsight/api/src/modules/database/entities/database.entity.ts

@@ -231,4 +231,4 @@ export class DatabaseEntity {
   @Expose()
   @Column({ nullable: true })
   version: string;
-}
+}

redisinsight/api/src/modules/database/repositories/local.database.repository.ts

@@ -262,4 +262,4 @@ export class LocalDatabaseRepository extends DatabaseRepository {
       }
     }
   }
-}
+}

redisinsight/api/src/modules/ssh/entities/ssh-options.entity.ts

@@ -48,4 +48,4 @@ export class SshOptionsEntity {
   )
   @JoinColumn()
   database: DatabaseEntity;
-}
+}

redisinsight/api/yarn.lock

@@ -9237,4 +9237,4 @@ yn@^2.0.0:
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

redisinsight/desktop/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "redisinsight",
+  "version": "1.0.0",
+  "main": "dist/index.js",
+  "scripts": {
+    "dev": "cross-env ELECTRON_DEV=true ELECTRON_ENABLE_LOGGING=true ELECTRON_DEBUG_LOGGING=true ELECTRON_ENABLE_STACK_DUMPING=true NODE_ENV=development yarn build && yarn build:preload && yarn build:renderer && electron . --enable-logging --inspect=5858",
+    "build": "cross-env ELECTRON_DEV=true ELECTRON_ENABLE_LOGGING=true ELECTRON_DEBUG_LOGGING=true ELECTRON_ENABLE_STACK_DUMPING=true NODE_ENV=development vite build --config vite.main.config.ts",
+    "build:preload": "cross-env ELECTRON_DEV=true ELECTRON_ENABLE_LOGGING=true ELECTRON_DEBUG_LOGGING=true ELECTRON_ENABLE_STACK_DUMPING=true NODE_ENV=development vite build --config vite.preload.config.ts",
+    "build:renderer": "cross-env ELECTRON_DEV=true ELECTRON_ENABLE_LOGGING=true ELECTRON_DEBUG_LOGGING=true ELECTRON_ENABLE_STACK_DUMPING=true NODE_ENV=development vite build --config vite.renderer.config.ts"
+  }
+}

redisinsight/desktop/preload.ts

@@ -34,4 +34,4 @@ contextBridge.exposeInMainWorld('app', {
   }
 } as WindowApp)
 
-export type IPCHandler = typeof ipcHandler
+export type IPCHandler = typeof ipcHandler

redisinsight/desktop/src/config/configMain.ts

@@ -7,6 +7,7 @@ import pkg from '../../../package.json'
 const config: any = configInit
 
 // Merge in some details from package.json
+config.defaultPort = process.env.NODE_ENV === 'development' ? 5540 : config.defaultPort
 config.name = pkg.appName
 config.description = pkg.description
 config.version = pkg.version
@@ -15,9 +16,10 @@ config.isDevelopment = process.env.NODE_ENV === 'development'
 config.isProduction = process.env.NODE_ENV === 'production'
 config.appPort = process.env.RI_APP_PORT || configInit.defaultPort
 config.getApiPort = () => process.env.RI_APP_PORT || configInit.defaultPort
+config.tcpLocalAuthPort = process.env.TCP_LOCAL_AUTH_PORT ? parseInt(process.env.TCP_LOCAL_AUTH_PORT, 10) : 5541
 
 config.icon = getAssetPath('icon.png')
 
-config.preloadPath = app.isPackaged ? path.join(__dirname, 'preload.js') : path.join(__dirname, '../../dll/preload.js')
+config.preloadPath = app.isPackaged ? path.join(__dirname, 'preload.js') : path.join(__dirname, '../../../dist/preload.js')
 
 export const configMain = config

redisinsight/desktop/src/config/configRenderer.ts

@@ -4,6 +4,7 @@ import pkg from '../../../package.json'
 const config: any = configInit
 
 // Merge in some details from package.json
+config.defaultPort = process.env.NODE_ENV === 'development' ? 5540 : config.defaultPort
 config.name = pkg.appName
 config.description = pkg.description
 config.version = pkg.version

redisinsight/desktop/src/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
+    <title>RedisInsight</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="../dist/index.js"></script>
+  </body>
+</html>

redisinsight/desktop/src/lib/app/deep-link.handlers.ts

@@ -52,4 +52,4 @@ export const deepLinkWindowHandler = async (parsedDeepLink?: IParsedDeepLink) =>
   } else if (currentWindow) {
     focusWindow(currentWindow)
   }
-}
+}

redisinsight/desktop/src/lib/auth/auth.factory.ts

@@ -0,0 +1,12 @@
+import { AuthStrategy } from './auth.interface'
+import { TcpAuthStrategy } from './tcp.auth.strategy'
+import { ServiceAuthStrategy } from './service.auth.strategy'
+
+export const createAuthStrategy = (
+  beApp?: any
+): AuthStrategy => {
+  if (process.env.USE_TCP_CLOUD_AUTH === 'true') {
+    return TcpAuthStrategy.getInstance()
+  }
+  return ServiceAuthStrategy.getInstance(beApp)
+}

redisinsight/desktop/src/lib/auth/auth.interface.ts

@@ -0,0 +1,7 @@
+export interface AuthStrategy {
+  initialize(): Promise<void>
+  shutdown(): Promise<void>
+  getAuthUrl(options: any): Promise<{ url: string }>
+  handleCallback(query: any): Promise<any>
+  getBackendApp?(): any
+}