Resolve conflicts

Author: Marishka17

packages/apps/dashboard/server/package.json

@@ -16,15 +16,17 @@
   },
   "dependencies": {
     "@human-protocol/sdk": "*",
-    "@nestjs/axios": "^3.0.2",
+    "@nestjs/axios": "^3.1.2",
     "@nestjs/cache-manager": "^2.2.2",
     "@nestjs/common": "^10.2.7",
     "@nestjs/config": "^3.2.3",
     "@nestjs/core": "^10.2.8",
     "@nestjs/mapped-types": "*",
     "@nestjs/platform-express": "^10.3.10",
-    "cache-manager-redis-store": "^3.0.1",
+    "cache-manager": "^5.4.0",
+    "cache-manager-redis-yet": "^5.1.5",
     "dayjs": "^1.11.12",
+    "lodash": "^4.17.21",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.2.0"
   },

packages/apps/dashboard/server/src/app.module.ts

@@ -21,8 +21,12 @@ import { StatsModule } from './modules/stats/stats.module';
       validationSchema: Joi.object({
         HOST: Joi.string().required(),
         PORT: Joi.number().port().default(3000),
+        REDIS_HOST: Joi.string(),
+        REDIS_PORT: Joi.number(),
         SUBGRAPH_API_KEY: Joi.string().required(),
         HCAPTCHA_API_KEY: Joi.string().required(),
+        CACHE_HMT_PRICE_TTL: Joi.number(),
+        CACHE_HMT_GENERAL_STATS_TTL: Joi.number(),
       }),
     }),
     CacheModule.registerAsync(CacheFactoryConfig),

packages/apps/dashboard/server/src/common/config/cache-factory.config.ts

@@ -1,7 +1,15 @@
 import { CacheModuleAsyncOptions } from '@nestjs/common/cache';
 import { ConfigModule } from '@nestjs/config';
+import * as _ from 'lodash';
 import { RedisConfigService } from './redis-config.service';
-import { redisStore } from 'cache-manager-redis-store';
+import { redisStore } from 'cache-manager-redis-yet';
+import { Logger } from '@nestjs/common';
+
+const logger = new Logger('CacheFactoryRedisStore');
+
+const throttledRedisErrorLog = _.throttle((error) => {
+  logger.error('Redis client network error', error);
+}, 1000 * 5);
 
 export const CacheFactoryConfig: CacheModuleAsyncOptions = {
   isGlobal: true,
@@ -12,7 +20,11 @@ export const CacheFactoryConfig: CacheModuleAsyncOptions = {
         host: configService.redisHost,
         port: configService.redisPort,
       },
+      disableOfflineQueue: true,
     });
+
+    store.client.on('error', throttledRedisErrorLog);
+
     return {
       store: () => store,
     };

packages/apps/dashboard/server/src/common/config/redis-config.service.ts

@@ -17,18 +17,22 @@ export class RedisConfigService {
     return this.configService.get<string>('REDIS_HOST', DEFAULT_REDIS_HOST);
   }
   get redisPort(): number {
-    return +this.configService.get<number>('REDIS_PORT', DEFAULT_REDIS_PORT);
+    return this.configService.get<number>('REDIS_PORT', DEFAULT_REDIS_PORT);
   }
   get cacheHmtPriceTTL(): number {
-    return +this.configService.get<number>(
-      'CACHE_HMT_PRICE_TTL',
-      DEFAULT_CACHE_HMT_PRICE_TTL,
+    return (
+      this.configService.get<number>(
+        'CACHE_HMT_PRICE_TTL',
+        DEFAULT_CACHE_HMT_PRICE_TTL,
+      ) * 1000
     );
   }
   get cacheHmtGeneralStatsTTL(): number {
-    return +this.configService.get<number>(
-      'CACHE_HMT_GENERAL_STATS_TTL',
-      DEFAULT_CACHE_HMT_GENERAL_STATS_TTL,
+    return (
+      this.configService.get<number>(
+        'CACHE_HMT_GENERAL_STATS_TTL',
+        DEFAULT_CACHE_HMT_GENERAL_STATS_TTL,
+      ) * 1000
     );
   }
   get hmtPriceCacheKey(): string {

packages/apps/dashboard/server/src/modules/stats/stats.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
 import { lastValueFrom } from 'rxjs';
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs';
 import { Cron } from '@nestjs/schedule';
 import { Cache, CACHE_MANAGER } from '@nestjs/cache-manager';
 import { NETWORKS, StatisticsClient } from '@human-protocol/sdk';
@@ -322,7 +322,7 @@ export class StatsService implements OnModuleInit {
     await this.cacheManager.set(
       this.redisConfigService.hmtPriceCacheKey,
       hmtPrice,
-      { ttl: this.redisConfigService.cacheHmtPriceTTL } as any,
+      this.redisConfigService.cacheHmtPriceTTL,
     );
     return hmtPrice;
   }

packages/apps/dashboard/server/tsconfig.json

@@ -16,6 +16,7 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
+    "noFallthroughCasesInSwitch": false,
+    "esModuleInterop": true
   }
 }

packages/apps/fortune/exchange-oracle/server/package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@human-protocol/sdk": "*",
-    "@nestjs/axios": "^3.0.2",
+    "@nestjs/axios": "^3.1.2",
     "@nestjs/common": "^10.2.7",
     "@nestjs/core": "^10.3.10",
     "joi": "^17.13.3",

packages/apps/fortune/recording-oracle/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@human-protocol/sdk": "*",
-    "@nestjs/axios": "^3.0.2",
+    "@nestjs/axios": "^3.1.2",
     "@nestjs/common": "^10.2.7",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.3.10",

packages/apps/human-app/frontend/package.json

@@ -49,7 +49,7 @@
     "zustand": "^4.5.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.18.1",
+    "@tanstack/eslint-plugin-query": "^5.60.1",
     "@tanstack/react-query-devtools": "^5.59.16",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^15.0.7",

packages/apps/human-app/frontend/src/api/services/common/get-access-token.ts renamed to packages/apps/human-app/frontend/src/api/services/common/use-access-token-refresh.ts

@@ -9,7 +9,7 @@ import type { AuthType } from '@/shared/types/browser-auth-provider';
 import { useWeb3Auth } from '@/auth-web3/use-web3-auth';
 import { routerPaths } from '@/router/router-paths';
 
-export function useGetAccessTokenMutation() {
+export function useAccessTokenRefresh() {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
   const {
@@ -23,7 +23,7 @@ export function useGetAccessTokenMutation() {
     user: web3User,
   } = useWeb3Auth();
 
-  return useMutation({
+  const mutation = useMutation({
     mutationFn: async ({
       authType,
       throwExpirationModalOnSignOut = true,
@@ -72,5 +72,13 @@ export function useGetAccessTokenMutation() {
     onError: async () => {
       await queryClient.invalidateQueries();
     },
+    scope: {
+      id: 'refresh-access-token',
+    },
   });
+
+  return {
+    refreshAccessToken: mutation.mutate,
+    refreshAccessTokenAsync: mutation.mutateAsync,
+  };
 }